Merge branch 'master' into bump_0.6.5
Bump to version 0.6.5