Merge staging/1.1.0 changes back to master.