Merge v1.1.1 into master