test to fix for DS issues on windows
fix cs
use _normalizePath()
simplify merges and cs
whitespace
Add missing @throws tag.
Merge pull request #3234 from dereuromark/3.0-cs

simplify merges and cs
Merge pull request #3232 from dereuromark/3.0-windows

3.0 windows
harden method signatures