Merge branch 'MDL-40386' of https://github.com/prateeksachan/moodle