Merge 1.1 to master