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