Commit 9bce220b70fb297c34689d0a731ca3b9f2b0e636

eustas 2016-06-10T11:06:15

Fix windows builds