Merge "Fix rebuildall.php fatal error with PostgreSQL"