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