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