Merge branch 'MDL-43731' of https://github.com/ramdesh/moodle