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