+ 1.0 rc3
Merge branch 'master' into fixes