Merge branch 'MDL-64743-master' of git://github.com/abias/moodle