- Some changes to support Windows threading
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	common/thread/Utils.cpp
- Small Windows compilation fixes
Merge pull request #576 from lukase/master

Windows build fixes