Merge "Avoid update.php suggestion on DB connection errors"