# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1492770148 -3600
# Node ID 62ad83c6a403412da40771458d0effcc8adcfe32
# Parent  789ce0944e4dff2209afa10953151086932dbbac# Parent  9d31ddedae2b5a9b51820d5d1857687e2ed08778
Merge branch 'master' into Dev_main

diff -r 789ce0944e4d -r 62ad83c6a403 js/core.js
--- a/js/core.js	Wed Apr 19 11:22:43 2017 +0100
+++ b/js/core.js	Fri Apr 21 11:22:28 2017 +0100
@@ -596,7 +596,7 @@
             } else {
                 jumpID = condition.jumpToOnFail;
             }
-            if (jumpID !== undefined) {
+            if (jumpID !== null) {
                 jumpToId.call(this, jumpID);
                 break;
             }
@@ -828,7 +828,7 @@
             }
             i++;
         }
-        processConditional.call(this, node, node.response);
+        processConditional.call(this, node, node.response.name);
         return true;
     }