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