CR1 codefreeze:

- updated version to 3.6.0