Merge branch 'MDL-51172' of git://github.com/ramdesh/moodle