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