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