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