Merge branch 'fixes0.6'