Fix windows build
Merge pull request #80 from CraigyDavi/fix-windows-build

Fix windows build
Merge remote-tracking branch 'upstream/master' into lock
clear lighting queue
Merge remote-tracking branch 'origin/lock' into lockvm