Merge remote-tracking branch 'nomis/master' into sms-windows-fixes
Small fix for windows
Made the small fixes cross-platform
Removed offending variable
Fixed the ThreadTests for Windows
Merge remote-tracking branch 'origin/master' into sms-windows-fixes
Fix lint issues
Addressed nomis52 comments
Removed excess new lines
Merge pull request #558 from nightrune/sms-windows-fixes

Small fixes for windows