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