Merge branch 'MDL-37801_glossary_links' of git://github.com/davosmith/moodle