diff --git a/VERSION.txt b/VERSION.txt
index e5bbd5b30d1..07298699360 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,6 +1,6 @@
 jetty-9.3.0-SNAPSHOT
 
-jetty-9.2.4.v20141031 - 31 October 2014
+jetty-9.2.4.v20141103 - 03 November 2014
  + 376365 "jetty.sh start" returns 0 on failure
  + 396569 'bin/jetty.sh stop' reports 'OK' even when jetty was not running
  + 396572 Starting jetty from cygwin is not working properly
@@ -77,9 +77,13 @@ jetty-9.2.4.v20141031 - 31 October 2014
  + 448841 Clarified selectors==0 javadoc 448840 Clarified ServerConnector
    javadoc 448839 Fixed javadoc typo in ServerConnector
  + 449001 Remove start.d directory from JETTY_HOME
+ + 449003 WARNING: Cannot enable requested module [protonego-impl]: not a valid
+   module name
  + 449038 WebSocketUpgradeFilter must support async.
  + 449175 Removed extra space in NCSA log
+ + 449291 create-files downloads without license
  + 449372 Make jvmArgs of jetty:run-forked configurable from command line
+<<<<<<< HEAD
  
 jetty-9.3.0.M0 - 24 September 2014
  + 437395 Start / Properties in template sections should be default applied for
@@ -116,6 +120,10 @@ jetty-9.3.0.M0 - 24 September 2014
  + 444771 JSR356 / EndPointConfig.userProperties are not unique per endpoint
    upgrade
  + 444863 ProxyServlet does not filter headers listed by the Connection header.
+||||||| merged common ancestors
+=======
+ + 449603 OutputStreamContentProvider hangs when host is not available.
+>>>>>>> origin/jetty-9.2.x
 
 jetty-9.2.3.v20140905 - 05 September 2014
  + 347110 renamed class transformer methods
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
index 6c988867072..eca1f7929fc 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
@@ -289,10 +289,9 @@ public class Main
         return "";
     }
 
-    public void invokeMain(StartArgs args) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException, ClassNotFoundException, IOException
+    public void invokeMain(ClassLoader classloader, StartArgs args) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException, ClassNotFoundException, IOException
     {
         Class<?> invoked_class = null;
-        ClassLoader classloader = args.getClasspath().getClassLoader();
         String mainclass = args.getMainClassname();
 
         try
@@ -317,8 +316,7 @@ public class Main
         { argArray.getClass() };
 
         Method main = invoked_class.getDeclaredMethod("main",method_param_types);
-        Object[] method_params = new Object[]
-        { argArray };
+        Object[] method_params = new Object[] { argArray };
         StartLog.endStartLog();
         main.invoke(null,method_params);
     }
@@ -810,14 +808,13 @@ public class Main
             System.err.println("WARNING: System properties and/or JVM args set.  Consider using --dry-run or --exec");
         }
 
-        // Set current context class loader to what is selected.
         ClassLoader cl = classpath.getClassLoader();
         Thread.currentThread().setContextClassLoader(cl);
 
         // Invoke the Main Class
         try
         {
-            invokeMain(args);
+            invokeMain(cl, args);
         }
         catch (Exception e)
         {
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java
index 9d8013cacd8..c65cb57e08e 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java
@@ -99,6 +99,7 @@ public class ArrayTrie<V> extends AbstractTrie<V>
         this(128);
     }
     
+    @SuppressWarnings("unchecked")
     public ArrayTrie(int capacityInNodes)
     {
         super(true);
@@ -151,8 +152,14 @@ public class ArrayTrie<V> extends AbstractTrie<V>
                 }
             }
         }
+        
+        if (t>=_key.length)
+        {
+            _rows=(char)_key.length;
+            return false;
+        }
+        
         _key[t]=v==null?null:s;
-        V old=(V)_value[t];
         _value[t] = v;
         return true;
     }
@@ -440,6 +447,6 @@ public class ArrayTrie<V> extends AbstractTrie<V>
     @Override
     public boolean isFull()
     {
-        return _rows+1==_key.length;
+        return _rows+1>=_key.length;
     }
 }
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/TrieTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/TrieTest.java
index a4a444cb678..25dc4c351e9 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/TrieTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/TrieTest.java
@@ -65,6 +65,24 @@ public class TrieTest
         trie.put("",9);
     }
 
+    @Test
+    public void testOverflow() throws Exception
+    {
+        int i=0;
+        while (true) 
+        {
+            if (++i>10000)
+                break; // must not be fixed size
+            if (!trie.put("prefix" + i, i))
+            {
+                Assert.assertTrue(trie.isFull());
+                break;
+            }
+        }
+        
+        Assert.assertTrue(!trie.isFull() || !trie.put("overflow", 0));
+    }
+    
     @Test
     public void testKeySet() throws Exception
     {