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