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