Merge branch 'master' into 0.6