Merge branch 'MDL-68931-master' of git://github.com/rezaies/moodle