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