3.19fix2.0
Merge branch 'master' into release_mysql