Merge branch 'MDL-65038_master' of https://github.com/maksudr/moodle