Merge pull request #3506 from ntherning/make-ZoneTest-succeed-on-mono-on-windows