Merge branch 'MDL-49795-master-test' of https://github.com/rezaies/moodle