Updates for 1.1.1 release
Merge branch 'release-1.1.1'