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