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