Fix test failing against MySQL
Merge branch 'master' into 5.6.0