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