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