Merge branch 'MDL-57244-master-text' of git://github.com/abgreeve/moodle