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