Update to 2.1.1
Merge branch 'hotfix/2.1.1'