Add Windows 8 and 8.1 support
Merge branch 'master' into viasat