Promote to 2.1.1
Merge branch 'release/2.1.1' into stable
Merge branch 'stable'
Promote to 2.1.2-SNAPSHOT