FX-326
Incorporated fixes for windows build
Merge remote-tracking branch 'origin/dev' into dev-chrono

Conflicts:
	include/fix8/tickval.hpp
Merge branch 'dev-chrono' into dev