Merge "Allow server selection when running sql.php"