Merge branch 'master' into master

Author: mark-edgeworth

packages/mbed-greentea/mbed_greentea/mbed_greentea_cli.py

@@ -983,7 +983,7 @@ def dump_report_to_text_file(filename, content):
             """
             try:
                 with io.open(filename, encoding="utf-8", errors="backslashreplace", mode="w") as f:
-                    f.write(content)
+                    f.write(content.decode('utf-8'))
             except IOError as e:
                 gt_logger.gt_log_err("can't export to '%s', reason:"% filename)
                 gt_logger.gt_log_err(str(e))

src/mbed_os_tools/detect/platform_database.py

@@ -229,7 +229,7 @@
         u"1307": u"NUMAKER_PFM_NUC240",
         u"1308": u"NUMAKER_IOT_M487",
         u"1309": u"NUMAKER_M252KG",
-        u"1310": u"NUMAKER_M263KI",
+        u"1310": u"NUMAKER_IOT_M263A",
         u"1500": u"RHOMBIO_L476DMW1K",
         u"1549": u"LPC1549",
         u"1600": u"LPC4330_M4",
@@ -244,6 +244,7 @@
         u'1904': u'CY8CPROTO_063_BLE',
         u'1905': u'CY8CKIT_062_4343W',
         u'1906': u'CYW943012P6EVB_01',
+        u'1907': u'CY8CPROTO_064_SB',
         u'1909': u'CY8CPROTO_062S2_43012',
         u"2000": u"EFM32_G8XX_STK",
         u"2005": u"EFM32HG_STK3400",