diff --git a/CMakeLists.txt b/CMakeLists.txt
index be14229e..afe79593 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,20 +1,22 @@
 cmake_minimum_required(VERSION 2.8.8)
 
+project(googletest-distribution)
+set(GOOGLETEST_VERSION 1.9.0)
+
 if (CMAKE_VERSION VERSION_LESS "3.1")
   add_definitions(-std=c++11)
 else()
   set(CMAKE_CXX_STANDARD 11)
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
-  set(CMAKE_CXX_EXTENSIONS OFF)
+  if(NOT CYGWIN)
+    set(CMAKE_CXX_EXTENSIONS OFF)
+  endif()
 endif()
 
 if (POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
 endif (POLICY CMP0048)
 
-project(googletest-distribution)
-set(GOOGLETEST_VERSION 1.9.0)
-
 enable_testing()
 
 include(CMakeDependentOption)
diff --git a/README.md b/README.md
index 1435929d..cb988ce0 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,6 @@ Google test has been used on a variety of platforms:
   * MinGW
   * Windows Mobile
   * Symbian
-  * PlatformIO
 
 ## Who Is Using Google Test? ##
 
diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md
index ea9b80fc..acb7f240 100644
--- a/googletest/docs/advanced.md
+++ b/googletest/docs/advanced.md
@@ -2430,7 +2430,7 @@ could generate this report:
   "failures": 1,
   "errors": 0,
   "time": "0.035s",
-  "timestamp": "2011-10-31T18:52:42Z",
+  "timestamp": "2011-10-31T18:52:42Z"
   "name": "AllTests",
   "testsuites": [
     {
@@ -2447,11 +2447,11 @@ could generate this report:
           "classname": "",
           "failures": [
             {
-              "message": "Value of: add(1, 1)\n  Actual: 3\nExpected: 2",
+              "message": "Value of: add(1, 1)\x0A  Actual: 3\x0AExpected: 2",
               "type": ""
             },
             {
-              "message": "Value of: add(1, -1)\n  Actual: 1\nExpected: 0",
+              "message": "Value of: add(1, -1)\x0A  Actual: 1\x0AExpected: 0",
               "type": ""
             }
           ]
@@ -2463,7 +2463,7 @@ could generate this report:
           "classname": ""
         }
       ]
-    },
+    }
     {
       "name": "LogicTest",
       "tests": 1,
@@ -2517,3 +2517,4 @@ environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when
 running the tests.
 
 **Availability**: Linux, Windows, Mac.
+