bumped to version 3.6.0
Merge branch 'develop'