Windows+2012+8

Ok, this should merge cleanly