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