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