Merge branch '1.0-dev'
fix
Merge branch 'master'