changelog and version
Merge branch 'release/1.11' into develop