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