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