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