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