Merge branch 'master' into vs2017

mcintyre321 · mcintyre321 · commit 448aacfa8134 · 2017-02-19T17:42:04.000Z
# Conflicts:
#	appveyor.yml
diff --git a/appveyor.yml b/appveyor.yml
@@ -33,4 +33,4 @@ deploy:
 - provider: Environment
   name: Nuget.org
   on:
-    branch: master
+    branch: master
