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