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