Merge v1.1 branch into master