Merge branch 'MDL-40264-essay-zero' of git://github.com/ktemkin/moodle