Fix for DB issues on new installs relating to database version checks.
Merge remote-tracking branch 'upstream/dev' into dev