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