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