Merge "Postgres updater fixes to make update.php able to run"