Merge branch 'MDL-70322-master' of git://github.com/roland04/moodle