1.1 merge to master

Merge 1.1 branch into master