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