Merge branch '1.0-MySql'
Merge branch 'master' into 1.0-MySql