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