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