Bump version to 3.6.0
Merge branch 'release/3.6.0'
Merge tag '3.6.0' into develop

3.6.0