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