Merge branch 'MDL-65074' of https://github.com/hitteshahuja/moodle into master