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