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