Merge commit 'colin_campbell/dbupgrade3.2' into master