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