Merge branch 'master' into testing

Author: medengineer

CMAKE_README.txt

@@ -7,6 +7,7 @@ Windows:
 "Visual Studio 12 2013 Win64"
 "Visual Studio 14 2015 Win64"
 "Visual Studio 15 2017 Win64"
+"Visual Studio 16 2019" -A x64
 Mac:
 "Xcode"
 Linux: (see note below)
@@ -18,4 +19,4 @@ For Linux Only:
 On linux, Debug and Release options are generated by cmake and must be specified like so:
 cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release ..
 or
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug ..
+cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug ..