Merge branch 'MDL-60811-master' of git://github.com/farhan6318/moodle