Merge branch 'MDL-63102-master' of git://github.com/peterRd/moodle