Refs #6688 comment test not working on Windows7
Merge branch 'feature/6688_RemoveTest' into develop