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