Merge branch 'MDL-51232' of git://github.com/jinuabraham/moodle