Merge branch 1.0 into master