Merge 1.0.0 changes back to master.