re #435 Updated upgrade.sql dump with latest DB changes.