Merge 1.0.0 changes to master.