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

TrieTests/trietest.json

@@ -33,7 +33,7 @@
       ["dog", "puppy"],
       ["shaman", ""]
     ],
-    "root": "0x4505cb6d817068bcd68fb225ab4d5ab70860461d3b35738bf6bcf7b44d702d0d"
+    "root": "0x5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84"
   },
   "foo": {
     "in": [
@@ -79,6 +79,6 @@
       ["0x000000000000000000000000697c7b8c961b56f675d570498424ac8de1a918f6", "0x6f6f6f6820736f2067726561742c207265616c6c6c793f000000000000000000"],
       ["0x6f6f6f6820736f2067726561742c207265616c6c6c793f000000000000000000", "0x697c7b8c961b56f675d570498424ac8de1a918f6"]
     ],
-    "root": "0x088c8e162c91c75ca9efa63f21530bbc6964cff7453a5d6af8404d090292a3e7"
+    "root": "0x9f6221ebb8efe7cff60a716ecb886e67dd042014be444669f0159d8e68b42100"
   }
 }