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