Merge tag '2.10' into develop

tagging
ready for v2.11
Merge branch 'release/2.11'