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