Update conference extension
Fix production vs. master merge conflict
Merge branch 'master' into production
Update conference extension
Update conference extension