Merge branch 'MDL-64761-master' of git://github.com/dpalou/moodle