Merge branch 'master' into mysql-config