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