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