Merge 1.1 to master

Doesn't seem to be in master