fix for end-of-file fatal error when end-marker is missing, is now merely a warning that can be dealt with automatically
Merge branch 'master' of github.com:proycon/colibri-core