Merge branch 'MDL-27732-glossary-introformat' of git://github.com/mudrd8mz/moodle