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