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