Merge "Make sql.php exit status more informative"