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