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