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