Minor fixes to version 2.1.1.
Updates.
Merge branch 'develop'