Merge branch 'master' into insiders

Author: bobbrow

Extension/package.json

@@ -205,7 +205,7 @@
           "type": "string",
           "enum": [
             "Forward Slash",
-            "Back Slash"
+            "Backslash"
           ],
           "default": "Forward Slash",
           "description": "The character used as a path separator for #include auto-completion results.",