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