v1.1, fix for v1
Merge branch 'hotfix-1.1'