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