Bringing over logging changes
Bringing latest changes over from dev
* Tested with Win32 / MacOS build