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