Merge branch 'release/2.1.11'
Merge tag '2.1.11' into develop

Tagging version 2.1.11 2.1.11