Refs #225

Don't treat vfsStream files as covered files.
Merge branch '1.2' into 2.0
Merge branch '2.0'