put in Dan's windows build fix to finish the pending big merge of master and Moritz's WORKING_BRANCH