Merge branch 'MDL-64956-master2' of git://github.com/peterRd/moodle