Fixed problem where some file content could be ignored when checking STDIN
Merge branch 'master' into report-memory-improvements