Merge branch 'hotfix/3.3.1' into production
Email us when someone upgrades
Merge branch 'hotfix/3.3.2'