Merge remote-tracking branch 'remotes/origin/master' into Branch_3d219e0a65b7b31c652791cbc7339ce99131a592

# Conflicts:
#	port/genhdr/qstrdefs.generated.h
#	port/mpconfigport.h

port/genhdr/qstrdefs.generated.h

@@ -576,20 +576,6 @@ QDEF(MP_QSTR_io, (const byte*)"\x23\x02" "io")
 QDEF(MP_QSTR_stdin, (const byte*)"\x21\x05" "stdin")
 QDEF(MP_QSTR_stdout, (const byte*)"\x08\x06" "stdout")
 QDEF(MP_QSTR_stderr, (const byte*)"\xa3\x06" "stderr")
-QDEF(MP_QSTR_platform, (const byte*)"\x3a\x08" "platform")
-QDEF(MP_QSTR_deque, (const byte*)"\x05\x05" "deque")
-QDEF(MP_QSTR_select, (const byte*)"\x8d\x06" "select")
-QDEF(MP_QSTR_poll, (const byte*)"\x9a\x04" "poll")
-QDEF(MP_QSTR_POLLERR, (const byte*)"\xdf\x07" "POLLERR")
-QDEF(MP_QSTR_POLLHUP, (const byte*)"\x77\x07" "POLLHUP")
-QDEF(MP_QSTR_POLLIN, (const byte*)"\x7d\x06" "POLLIN")
-QDEF(MP_QSTR_POLLOUT, (const byte*)"\x74\x07" "POLLOUT")
-QDEF(MP_QSTR_ipoll, (const byte*)"\x53\x05" "ipoll")
-QDEF(MP_QSTR_register, (const byte*)"\xac\x08" "register")
-QDEF(MP_QSTR_modify, (const byte*)"\xf5\x06" "modify")
-QDEF(MP_QSTR_SOL_SOCKET, (const byte*)"\x0f\x0a" "SOL_SOCKET")
-QDEF(MP_QSTR_SO_REUSEADDR, (const byte*)"\x21\x0c" "SO_REUSEADDR")
-QDEF(MP_QSTR_pend_throw, (const byte*)"\xf3\x0a" "pend_throw")
 
 
 // This file was automatically generated by makeqstrdata.py