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