diff --git a/ConnectionManager.iml b/ConnectionManager.iml
index 95c0b9b..7cf1de5 100644
--- a/ConnectionManager.iml
+++ b/ConnectionManager.iml
@@ -169,6 +169,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/stringprep.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="VcsManagerConfiguration">
diff --git a/build/build.xml b/build/build.xml
index 81a921c..abe4aba 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -64,7 +64,7 @@
     <property name="version.major" value="3"/>
     <property name="version.minor" value="2"/>
     <property name="version.revision" value="0"/>
-    <property name="version.extra" value="beta"/> <!-- For 'beta' or 'alpha' -->
+    <property name="version.extra" value=""/> <!-- For 'beta' or 'alpha' -->
     <property name="dist.prefix" value="connection_manager"/>
 
     <property file="${basedir}/build/build.properties"/>
diff --git a/src/java/org/jivesoftware/multiplexer/ConnectionManager.java b/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
index 81f48fe..294251a 100644
--- a/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
+++ b/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
@@ -148,7 +148,7 @@
         name = JiveGlobals.getXMLProperty("xmpp.manager.name", StringUtils.randomString(5)).toLowerCase();
         serverName = JiveGlobals.getXMLProperty("xmpp.domain");
 
-        version = new Version(3, 2, 0, Version.ReleaseStatus.Beta, 0);
+        version = new Version(3, 2, 0, Version.ReleaseStatus.Release_Candidate, 2);
         if (serverName != null) {
             setupMode = false;
         }
diff --git a/src/java/org/jivesoftware/multiplexer/net/NIOConnection.java b/src/java/org/jivesoftware/multiplexer/net/NIOConnection.java
index 2028dcc..529569b 100644
--- a/src/java/org/jivesoftware/multiplexer/net/NIOConnection.java
+++ b/src/java/org/jivesoftware/multiplexer/net/NIOConnection.java
@@ -139,7 +139,7 @@
         synchronized (this) {
             if (!isClosed()) {
                 try {
-                    deliverRawText("</stream:stream>");
+                    deliverRawText(flashClient ? "</flash:stream>" : "</stream:stream>");
                 } catch (Exception e) {
                     // Ignore
                 }
diff --git a/src/java/org/jivesoftware/multiplexer/net/StanzaHandler.java b/src/java/org/jivesoftware/multiplexer/net/StanzaHandler.java
index 6cb6016..6c9b522 100644
--- a/src/java/org/jivesoftware/multiplexer/net/StanzaHandler.java
+++ b/src/java/org/jivesoftware/multiplexer/net/StanzaHandler.java
@@ -34,7 +34,6 @@
      * The utf-8 charset for decoding and encoding Jabber packet streams.
      */
     protected static String CHARSET = "UTF-8";
-    private static final String STREAM_START = "<stream:stream";
     /**
      * Reuse the same factory for all the connections.
      */
@@ -92,7 +91,7 @@
 
     public void process(String stanza, XmlPullParser parser) throws Exception {
 
-        boolean initialStream = stanza.startsWith(STREAM_START);
+        boolean initialStream = stanza.startsWith("<stream:stream") || stanza.startsWith("<flash:stream");
         if (!sessionCreated || initialStream) {
             if (!initialStream) {
                 // Ignore <?xml version="1.0"?>
diff --git a/src/java/org/jivesoftware/multiplexer/net/XMLLightweightParser.java b/src/java/org/jivesoftware/multiplexer/net/XMLLightweightParser.java
index fa568dc..022cb59 100644
--- a/src/java/org/jivesoftware/multiplexer/net/XMLLightweightParser.java
+++ b/src/java/org/jivesoftware/multiplexer/net/XMLLightweightParser.java
@@ -225,8 +225,8 @@
                 if (ch == '"') {
                     status = XMLLightweightParser.INSIDE_PARAM_VALUE;
                 } else if (ch == '>') {
-                    if (insideRootTag &&
-                            ("stream:stream>".equals(head.toString()) || ("?xml>".equals(head.toString())))) {
+                    if (insideRootTag && ("stream:stream>".equals(head.toString()) ||
+                            ("?xml>".equals(head.toString())) || ("flash:stream>".equals(head.toString())))) {
                         // Found closing stream:stream
                         int end = buffer.length() - readByte + (i + 1);
                         // Skip LF, CR and other "weird" characters that could appear
@@ -267,7 +267,8 @@
                 }
             }
         }
-        if (head.length() > 0 && "/stream:stream>".equals(head.toString())) {
+        if (head.length() > 0 &&
+                ("/stream:stream>".equals(head.toString()) || ("/flash:stream>".equals(head.toString())))) {
             // Found closing stream:stream
             foundMsg("</stream:stream>");
         }