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