Merge branch 'release/2.11.0' into develop
removes debugging coding accidentally left around
Version and history
Merge branch 'release/2.11.1'