Merge 1.1 into master