Fix the 3.2 database update.
Merge branch 'master' into develop