Merge branch 'MDL-70066-master' of git://github.com/lameze/moodle