Merge remote-tracking branch 'origin/master' into develop

CJentzsch · CJentzsch · commit bee0a4100c69 · 2014-10-21T17:15:05.000+02:00
diff --git a/vmtests/vmIOandFlowOperationsTest.json b/vmtests/vmIOandFlowOperationsTest.json
@@ -1369,4 +1369,4 @@
             }
         }
     }
-}
+}
