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