diff --git a/Lib/python/std_unordered_multiset.i b/Lib/python/std_unordered_multiset.i
index 4b67c7305..b0f3f096b 100644
--- a/Lib/python/std_unordered_multiset.i
+++ b/Lib/python/std_unordered_multiset.i
@@ -7,9 +7,9 @@
 %fragment("StdUnorderedMultisetTraits","header",fragment="StdSequenceTraits")
 %{
   namespace swig {
-    template <class SwigPySeq, class Key> 
+    template <class SwigPySeq, class Key, class Hash, class Compare, class Alloc>
     inline void
-    assign(const SwigPySeq& swigpyseq, std::unordered_multiset<Key>* seq) {
+    assign(const SwigPySeq& swigpyseq, std::unordered_multiset<Key,Hash,Compare,Alloc>* seq) {
       // seq->insert(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented
       typedef typename SwigPySeq::value_type value_type;
       typename SwigPySeq::const_iterator it = swigpyseq.begin();
@@ -18,24 +18,24 @@
       }
     }
 
-    template <class Key>
-    struct traits_reserve<std::unordered_multiset<Key> >  {
-      static void reserve(std::unordered_multiset<Key> &seq, typename std::unordered_multiset<Key>::size_type n) {
+    template <class Key, class Hash, class Compare, class Alloc>
+    struct traits_reserve<std::unordered_multiset<Key,Hash,Compare,Alloc> >  {
+      static void reserve(std::unordered_multiset<Key,Hash,Compare,Alloc> &seq, typename std::unordered_multiset<Key,Hash,Compare,Alloc>::size_type n) {
         seq.reserve(n);
       }
     };
 
-    template <class Key>
-    struct traits_asptr<std::unordered_multiset<Key> >  {
-      static int asptr(PyObject *obj, std::unordered_multiset<Key> **m) {
-	return traits_asptr_stdseq<std::unordered_multiset<Key> >::asptr(obj, m);
+    template <class Key, class Hash, class Compare, class Alloc>
+    struct traits_asptr<std::unordered_multiset<Key,Hash,Compare,Alloc> >  {
+      static int asptr(PyObject *obj, std::unordered_multiset<Key,Hash,Compare,Alloc> **m) {
+	return traits_asptr_stdseq<std::unordered_multiset<Key,Hash,Compare,Alloc> >::asptr(obj, m);
       }
     };
 
-    template <class Key>
-    struct traits_from<std::unordered_multiset<Key> > {
-      static PyObject *from(const std::unordered_multiset<Key>& vec) {
-	return traits_from_stdseq<std::unordered_multiset<Key> >::from(vec);
+    template <class Key, class Hash, class Compare, class Alloc>
+    struct traits_from<std::unordered_multiset<Key,Hash,Compare,Alloc> > {
+      static PyObject *from(const std::unordered_multiset<Key,Hash,Compare,Alloc>& vec) {
+	return traits_from_stdseq<std::unordered_multiset<Key,Hash,Compare,Alloc> >::from(vec);
       }
     };
   }
diff --git a/Lib/python/std_unordered_set.i b/Lib/python/std_unordered_set.i
index 9eab62226..79fca6c2f 100644
--- a/Lib/python/std_unordered_set.i
+++ b/Lib/python/std_unordered_set.i
@@ -5,9 +5,9 @@
 %fragment("StdUnorderedSetTraits","header",fragment="StdSequenceTraits")
 %{
   namespace swig {
-    template <class SwigPySeq, class Key> 
+    template <class SwigPySeq, class Key, class Hash, class Compare, class Alloc>
     inline void 
-    assign(const SwigPySeq& swigpyseq, std::unordered_set<Key>* seq) {
+    assign(const SwigPySeq& swigpyseq, std::unordered_set<Key,Hash,Compare,Alloc>* seq) {
       // seq->insert(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented
       typedef typename SwigPySeq::value_type value_type;
       typename SwigPySeq::const_iterator it = swigpyseq.begin();
@@ -16,24 +16,24 @@
       }
     }
 
-    template <class Key>
-    struct traits_reserve<std::unordered_set<Key> >  {
-      static void reserve(std::unordered_set<Key> &seq, typename std::unordered_set<Key>::size_type n) {
+    template <class Key, class Hash, class Compare, class Alloc>
+    struct traits_reserve<std::unordered_set<Key,Hash,Compare,Alloc> >  {
+      static void reserve(std::unordered_set<Key,Hash,Compare,Alloc> &seq, typename std::unordered_set<Key,Hash,Compare,Alloc>::size_type n) {
         seq.reserve(n);
       }
     };
 
-    template <class Key>
-    struct traits_asptr<std::unordered_set<Key> >  {
-      static int asptr(PyObject *obj, std::unordered_set<Key> **s) {
-	return traits_asptr_stdseq<std::unordered_set<Key> >::asptr(obj, s);
+    template <class Key, class Hash, class Compare, class Alloc>
+    struct traits_asptr<std::unordered_set<Key,Hash,Compare,Alloc> >  {
+      static int asptr(PyObject *obj, std::unordered_set<Key,Hash,Compare,Alloc> **s) {
+	return traits_asptr_stdseq<std::unordered_set<Key,Hash,Compare,Alloc> >::asptr(obj, s);
       }
     };
 
-    template <class Key>
-    struct traits_from<std::unordered_set<Key> > {
-      static PyObject *from(const std::unordered_set<Key>& vec) {
-	return traits_from_stdseq<std::unordered_set<Key> >::from(vec);
+    template <class Key, class Hash, class Compare, class Alloc>
+    struct traits_from<std::unordered_set<Key,Hash,Compare,Alloc> > {
+      static PyObject *from(const std::unordered_set<Key,Hash,Compare,Alloc>& vec) {
+	return traits_from_stdseq<std::unordered_set<Key,Hash,Compare,Alloc> >::from(vec);
       }
     };
   }
diff --git a/Lib/ruby/std_unordered_multiset.i b/Lib/ruby/std_unordered_multiset.i
index 4bc13790a..dae13eef3 100644
--- a/Lib/ruby/std_unordered_multiset.i
+++ b/Lib/ruby/std_unordered_multiset.i
@@ -7,9 +7,9 @@
 %fragment("StdUnorderedMultisetTraits","header",fragment="StdUnorderedSetTraits")
 %{
   namespace swig {
-    template <class RubySeq, class Key>
+    template <class RubySeq, class Key, class Hash, class Compare, class Alloc>
     inline void
-    assign(const RubySeq& rubyseq, std::unordered_multiset<Key>* seq) {
+    assign(const RubySeq& rubyseq, std::unordered_multiset<Key,Hash,Compare,Alloc>* seq) {
       // seq->insert(rubyseq.begin(), rubyseq.end()); // not used as not always implemented
       typedef typename RubySeq::value_type value_type;
       typename RubySeq::const_iterator it = rubyseq.begin();
@@ -18,17 +18,17 @@
       }
     }
 
-    template <class Key>
-    struct traits_asptr<std::unordered_multiset<Key> >  {
-      static int asptr(VALUE obj, std::unordered_multiset<Key> **m) {
-	return traits_asptr_stdseq<std::unordered_multiset<Key> >::asptr(obj, m);
+    template <class Key, class Hash, class Compare, class Alloc>
+    struct traits_asptr<std::unordered_multiset<Key,Hash,Compare,Alloc> >  {
+      static int asptr(VALUE obj, std::unordered_multiset<Key,Hash,Compare,Alloc> **m) {
+	return traits_asptr_stdseq<std::unordered_multiset<Key,Hash,Compare,Alloc> >::asptr(obj, m);
       }
     };
 
-    template <class Key>
-    struct traits_from<std::unordered_multiset<Key> > {
-      static VALUE from(const std::unordered_multiset<Key>& vec) {
-	return traits_from_stdseq<std::unordered_multiset<Key> >::from(vec);
+    template <class Key, class Hash, class Compare, class Alloc>
+    struct traits_from<std::unordered_multiset<Key,Hash,Compare,Alloc> > {
+      static VALUE from(const std::unordered_multiset<Key,Hash,Compare,Alloc>& vec) {
+	return traits_from_stdseq<std::unordered_multiset<Key,Hash,Compare,Alloc> >::from(vec);
       }
     };
   }
diff --git a/Lib/ruby/std_unordered_set.i b/Lib/ruby/std_unordered_set.i
index 84d3b4b09..e8e1b0872 100644
--- a/Lib/ruby/std_unordered_set.i
+++ b/Lib/ruby/std_unordered_set.i
@@ -7,9 +7,9 @@
 %fragment("StdUnorderedSetTraits","header",fragment="<stddef.h>",fragment="StdSetTraits")
 %{
   namespace swig {
-    template <class RubySeq, class Key>
+    template <class RubySeq, class Key, class Hash, class Compare, class Alloc>
     inline void
-    assign(const RubySeq& rubyseq, std::unordered_set<Key>* seq) {
+    assign(const RubySeq& rubyseq, std::unordered_set<Key,Hash,Compare,Alloc>* seq) {
       // seq->insert(rubyseq.begin(), rubyseq.end()); // not used as not always implemented
       typedef typename RubySeq::value_type value_type;
       typename RubySeq::const_iterator it = rubyseq.begin();
@@ -18,17 +18,17 @@
       }
     }
 
-    template <class Key>
-    struct traits_asptr<std::unordered_set<Key> >  {
-      static int asptr(VALUE obj, std::unordered_set<Key> **s) {
-	return traits_asptr_stdseq<std::unordered_set<Key> >::asptr(obj, s);
+    template <class Key, class Hash, class Compare, class Alloc>
+    struct traits_asptr<std::unordered_set<Key,Hash,Compare,Alloc> >  {
+      static int asptr(VALUE obj, std::unordered_set<Key,Hash,Compare,Alloc> **s) {
+	return traits_asptr_stdseq<std::unordered_set<Key,Hash,Compare,Alloc> >::asptr(obj, s);
       }
     };
 
-    template <class Key>
-    struct traits_from<std::unordered_set<Key> > {
-      static VALUE from(const std::unordered_set<Key>& vec) {
-	return traits_from_stdseq<std::unordered_set<Key> >::from(vec);
+    template <class Key, class Hash, class Compare, class Alloc>
+    struct traits_from<std::unordered_set<Key,Hash,Compare,Alloc> > {
+      static VALUE from(const std::unordered_set<Key,Hash,Compare,Alloc>& vec) {
+	return traits_from_stdseq<std::unordered_set<Key,Hash,Compare,Alloc> >::from(vec);
       }
     };
   }