Version history 1.1.0.0
Merge 1.1.0.0 to master