Merge branch 'wip-MDL-61746-master' of https://github.com/RohithSrk/moodle