Merge 1.1 fixes to master (1.2)