Merge branch 'master_MDL-39910' of https://github.com/mayankgupta/moodle