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