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