Attempt to merge master and mysql.