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