Merge branch 'MDL-60236-master' of git://github.com/ankitagarwal/moodle