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