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