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