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