version bump
Merge branch 'release/3.6.0' into develop