Merge branch 'MDL-43996-master' of git://github.com/jethac/moodle