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