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