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