Merge 1.1 with master