Preparing release 3.6
Back to development: 3.6.1