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