Merge "Ensure only strings are passed to mysql_real_escape_string()"