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