Merge branch 'dev' of https://github.com/firepick1/FireSight into dev
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Windows  passes unit test