Bumped version for release of 3.6.4
Merge branch 'release/3.6.4' into develop
Bumped version for development after release.