Merge "Make MySQLi work with non-standard port"