Merging 1.1 to master