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