Version bump
Merge branch '1.0RC1'
Merge branch 'master' into dev