Windows installer work (fixes #881)