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