From 117c5601e6820d71257d0804b7f28a3e539e9cb6 Mon Sep 17 00:00:00 2001
From: Sam El-Husseini <samelh@microsoft.com>
Date: Sat, 10 Jun 2017 12:15:29 -0700
Subject: [PATCH 1/4] bump pxt-core to 0.12.83,

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d4de35f1..94b69fc4 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,6 @@
     "semantic-ui-less": "^2.2.4"
   },
   "dependencies": {
-    "pxt-core": "0.12.82"
+    "pxt-core": "0.12.83"
   }
 }

From 1875cc306f5c31f0be04b7422b85a7689da47280 Mon Sep 17 00:00:00 2001
From: Sam El-Husseini <samelh@microsoft.com>
Date: Sat, 10 Jun 2017 12:15:35 -0700
Subject: [PATCH 2/4] 0.12.25

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 94b69fc4..fe38839a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pxt-microbit",
-  "version": "0.12.24",
+  "version": "0.12.25",
   "description": "micro:bit target for Microsoft MakeCode (PXT)",
   "keywords": [
     "JavaScript",

From 07380d7c0726abe211f4f2af312a5981d2f55d8b Mon Sep 17 00:00:00 2001
From: Tom Ball <tball@microsoft.com>
Date: Sun, 11 Jun 2017 15:49:16 -0700
Subject: [PATCH 3/4] fix null dereference

---
 libs/core/music.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/core/music.ts b/libs/core/music.ts
index 1b62279e..01b8b20a 100644
--- a/libs/core/music.ts
+++ b/libs/core/music.ts
@@ -342,8 +342,8 @@ namespace music {
                         control.raiseEvent(MICROBIT_MELODY_ID, MusicEvent.BackgroundMelodyResumed);
                     }
                 }
-                currentMelody = null;
                 control.raiseEvent(MICROBIT_MELODY_ID, currentMelody.background ? MusicEvent.BackgroundMelodyEnded : MusicEvent.MelodyEnded);
+                currentMelody = null;
             })
         }
     }

From 0ea82518fbf934bc70dd3da3d3b10370d14a5ded Mon Sep 17 00:00:00 2001
From: Sam El-Husseini <samelh@microsoft.com>
Date: Mon, 12 Jun 2017 15:27:58 -0700
Subject: [PATCH 4/4] Update serial filter.

---
 pxtarget.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pxtarget.json b/pxtarget.json
index 53196a02..e4e82fd7 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -193,7 +193,8 @@
         "serviceId": "microbit"
     },
     "serial": {
-        "manufacturerFilter": "^mbed$",
+        "productFilter": "0x0204",
+        "vendorFilter": "0x0d28",
         "nameFilter": "^mbed Serial Port",
         "log": true
     },