1.1.x

Merge 1.1.x into master