Merge branch 'MDL-68636-master' of git://github.com/aanabit/moodle