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