Merge branch 'MDL-37641-master' of git://github.com/FMCorz/moodle