Merge branch 'jk/config-no-ungetc-eof'