Merge branch 'w02_MDL-37151_m25_mimetex' of git://github.com/skodak/moodle