Fix [651e828a52]: Wrong Windows version reported for Windows 8.1
Fix [651e828a52]: Wrong Windows version reported for Windows 8.1
merge trunk