Manually merged Tjr's MySQLDatabase changes