merge upstream

1 files changed, 3 insertions, 2 deletions

diff --git a/threads.js b/threads.js
index c293af6..1665d0b 100644
--- a/threads.js
+++ b/threads.js
@@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.threads = '2014-December-11';
+modules.threads = '2014-December-17';
 
 var ThreadManager;
 var Process;
@@ -243,7 +243,7 @@ ThreadManager.prototype.removeTerminatedProcesses = function () {
     // and un-highlight their scripts
     var remaining = [];
     this.processes.forEach(function (proc) {
-        if (!proc.isRunning() && !proc.errorFlag && !proc.isDead) {
+        if ((!proc.isRunning() && !proc.errorFlag) || proc.isDead) {
             if (proc.topBlock instanceof BlockMorph) {
                 proc.topBlock.removeHighlight();
             }
@@ -2615,6 +2615,7 @@ Process.prototype.reportContextFor = function (context, otherObj) {
     if (result.outerContext) {
         result.outerContext = copy(result.outerContext);
         result.outerContext.receiver = otherObj;
+        result.outerContext.variables.parentFrame = otherObj.variables;
     }
     return result;
 };