Merge branch 'MDL-64119-master' of git://github.com/sarjona/moodle