Merge v1.1.0 into master