Merge mod_revealjs/master