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