Merge branch 'wip-mdl-57851-m31' of https://github.com/rajeshtaneja/moodle into MOODL...