Merge remote-tracking branch 'upstream/master' into listsort. Lots of conflict fun.

Conflicts:
	py/obj.h
	py/objbool.c
	py/objboundmeth.c
	py/objcell.c
	py/objclass.c
	py/objclosure.c
	py/objcomplex.c
	py/objdict.c
	py/objexcept.c
	py/objfun.c
	py/objgenerator.c
	py/objinstance.c
	py/objmodule.c
	py/objrange.c
	py/objset.c
	py/objslice.c

1 files changed, 2 insertions, 3 deletions

diff --git a/py/objbool.c b/py/objbool.c
index 3fd35a05f..cfab7db06 100644
--- a/py/objbool.c
+++ b/py/objbool.c
@@ -32,11 +32,10 @@ static mp_obj_t bool_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args
 }
 
 const mp_obj_type_t bool_type = {
-    .base = { &mp_const_type },
-    .name = "bool",
+    { &mp_const_type },
+    "bool",
     .print = bool_print,
     .make_new = bool_make_new,
-    .methods = {{NULL, NULL},},
 };
 
 static const mp_obj_bool_t false_obj = {{&bool_type}, false};