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