Diff for Windows builds (fast-forward)

Identical to ninsbl:master except that it can be fast-forward merged onto current master. 
Compiles on linux and windows.