Merge branch 'master' into bump_0.6.4