Merge branch 'dev' into dev2

contrib/vcpkg/vcpkg.json

@@ -19,7 +19,7 @@
   "features": {
     "c": {
       "description": "Use C11 compilation (this can still override new/delete)"
-    },    
+    },
     "override": {
       "description": "Override the standard malloc/free interface"
     },
@@ -31,6 +31,6 @@
     },
     "asm": {
       "description": "Generate assembly files"
-    }   
+    }
   }
 }