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

3.6.1