Version bump
Merge branch 'r/1.0'