Ice35 support for Windows (rebased to develop)

This PR effectively rebases #785 with the exception that the changes in the first commit there had already been partially made on develop by @rleigh-dundee

--rebased-from #785