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