Re: Add support for Windows Server 2012/R2 (plus clean-up) (try 2)