2.1.1 release
Merge branch 'releases/2.1.1'