Merge branch 'master' into 0.8.7