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