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