Merge branch 'hotfix/0.21.30'
Update conference_submitted.txt.mako
Merge branch 'hotfix/0.21.32' into develop