Release v2.0.11, see ChangeLog for details.
Merge branch 'release/2.0.11' into develop