Update conference extension
Merge branch 'master' into production