Global
- fixes for Windows build
Global
- added build date and name
Merge remote-tracking branch 'upstream/master'