Correct handling of clean EOF; variable uninitialized in logging
Version 1.9.9
Merge branch 'develop'