Merge branch '1.0-dev'
Merge branch 'master' into 1.0-dev