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