Merge branch 'master' of https://github.com/OpenUpgrade/OpenUpgrade into email_template