Merge branch 'windows_sdk_7.0'