Merge branch 'master' into bump_0.6.4
Bump version to 0.6.4