Merge branch 'master' into live

Author: kenwith

exchange/docfx.json

@@ -39,6 +39,7 @@
           "**/*.png",
           "**/*.jpg"
         ],
+        "version": "exchange-ps",
         "exclude": [
           "**/obj/**",
           "**/includes/**"
@@ -68,4 +69,4 @@
     "template": [],
     "dest": "exchange-ps"
   }
-}
+}