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