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