prepared for release 1.6
Merge branch 'release/1.6' into develop