Merge remote-tracking branch 'origin/master' into loci-split

Conflicts:
	c_gen/codegen.py
diff --git a/c_gen/codegen.py b/c_gen/codegen.py
index 2bc62ca..3249747 100644
--- a/c_gen/codegen.py
+++ b/c_gen/codegen.py
@@ -62,7 +62,7 @@
                     # Special case for version
                     pwtms.append(PushWireTypesMember(m.name, m.offset, m.length, "obj->version"))
                 else:
-                    pwtms.append(PushWireTypesMember(m.name, m.offset, m.length, m.value))
+                    pwtms.append(PushWireTypesMember(m.name, m.offset, m.length, hex(m.value)))
         type_members_by_version[version] = pwtms
 
     # Merge versions with identical type members