Merge 1.1.0 changes to master.