Merging 1.1 changes into my master