Merge 1.0.x into master