Update versions for 2.1.1 release.
Merge branch 'release/2.1.1' into develop