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