diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java
index 8843f03acf..ac7216114f 100644
--- a/source/java/org/alfresco/repo/jscript/ScriptNode.java
+++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java
@@ -715,6 +715,28 @@ public class ScriptNode implements Serializable, Scopeable, NamespacePrefixResol
         return getChildAssocs();
     }
     
+    /**
+     * Return an Array of the associations from this Node that match a specific object type.
+     * <code>node.getChildAssocsByType("cm:folder")[0]</code>
+     * 
+     * @return Array of child associations from this Node that match a specific object type.
+     */
+    @SuppressWarnings("unchecked")
+    public Scriptable getChildAssocsByType(String type)
+    {
+        // get the list of child assoc nodes for each association type
+        Set<QName> types = new HashSet<QName>(1, 1.0f);
+        types.add(createQName(type));
+        List<ChildAssociationRef> refs = this.nodeService.getChildAssocs(this.nodeRef, types);
+        Object[] nodes = new Object[refs.size()];
+        for (int i=0; i<nodes.length; i++)
+        {
+            ChildAssociationRef ref = refs.get(i);
+            nodes[i] = newInstance(ref.getChildRef(), this.services, this.scope);
+        }
+        return Context.getCurrentContext().newArray(this.scope, nodes);
+    }
+    
     /**
      * Return the parent associations to this Node. As a Map of assoc name to a JavaScript array of Nodes.
      * The Map returned implements the Scriptable interface to allow access to the assoc arrays via JavaScript
diff --git a/source/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java b/source/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java
index c119f9157c..d8b5f4d59e 100644
--- a/source/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java
+++ b/source/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java
@@ -167,14 +167,17 @@ public class InMemoryTicketComponentImpl implements TicketComponent
         if (sessionId != null)
         {
             Ticket ticketObj = ticketsCache.get(ticketKey);
-            ticketObj = ticketObj.removeSessionId(sessionId);
-            if (ticketObj == null)
+            if (ticketObj != null)
             {
-                ticketsCache.remove(ticketKey);
-            }
-            else
-            {
-                ticketsCache.put(ticketKey, ticketObj);
+                ticketObj = ticketObj.removeSessionId(sessionId);
+                if (ticketObj == null)
+                {
+                    ticketsCache.remove(ticketKey);
+                }
+                else
+                {
+                    ticketsCache.put(ticketKey, ticketObj);
+                }
             }
         }
         else
diff --git a/source/java/org/alfresco/repo/template/TemplateNode.java b/source/java/org/alfresco/repo/template/TemplateNode.java
index 40244a491e..0aca5f0679 100644
--- a/source/java/org/alfresco/repo/template/TemplateNode.java
+++ b/source/java/org/alfresco/repo/template/TemplateNode.java
@@ -28,8 +28,10 @@ import java.io.Serializable;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.ServiceRegistry;
@@ -336,6 +338,23 @@ public class TemplateNode extends BasePermissionsNode implements NamespacePrefix
         return getChildAssocs();
     }
     
+    /**
+     * @return The list of children of this Node that match a specific object type.
+     */
+    public List<TemplateNode> getChildAssocsByType(String type)
+    {
+        Set<QName> types = new HashSet<QName>(1, 1.0f);
+        types.add(createQName(type));
+        List<ChildAssociationRef> refs = this.services.getNodeService().getChildAssocs(this.nodeRef, types);
+        List<TemplateNode> nodes = new ArrayList<TemplateNode>(refs.size());
+        for (ChildAssociationRef ref : refs)
+        {
+            String qname = ref.getTypeQName().toString();
+            nodes.add( new TemplateNode(ref.getChildRef(), this.services, this.imageResolver) );
+        }
+        return nodes;
+    }
+    
     /**
      * @return true if the node is currently locked
      */
@@ -520,6 +539,27 @@ public class TemplateNode extends BasePermissionsNode implements NamespacePrefix
         return this.imageResolver;
     }
     
+    /**
+     * Helper to create a QName from either a fully qualified or short-name QName string
+     * 
+     * @param s    Fully qualified or short-name QName string
+     * 
+     * @return QName
+     */
+    private QName createQName(String s)
+    {
+        QName qname;
+        if (s.indexOf(NAMESPACE_BEGIN) != -1)
+        {
+            qname = QName.createQName(s);
+        }
+        else
+        {
+            qname = QName.createQName(s, this.services.getNamespaceService());
+        }
+        return qname;
+    }
+    
     
     // ------------------------------------------------------------------------------
     // Inner classes