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