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