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