Merge branch 'release/0.6.4' into develop
Bugger
Bump to 0.6.5
Merge branch 'release/0.6.5'