merge default

diff --cc test/ext/test_serializer.py
index 47edbdaaab6b1f82dcd212a3f025eb48178081a6,74e033b4f5ccc80a39417b3b7c7d337eb36c16c5..0c7298a8b33ab8f1983cab71752926dfec81d2e8
--- 1/test/ext/test_serializer.py
--- 2/test/ext/test_serializer.py
+++ b/test/ext/test_serializer.py
@@@ -121,8 -122,9 +122,9 @@@ class SerializeTest(fixtures.MappedTest
          q2 = serializer.loads(serializer.dumps(q, -1), users.metadata,
                                Session)
          eq_(q2.all(), [User(name='fred')])
 -        eq_(list(q2.values(User.id, User.name)), [(9, u'fred')])
 +        eq_(list(q2.values(User.id, User.name)), [(9, 'fred')])
  
+     @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported")
      def test_query_three(self):
          ua = aliased(User)
          q = \
@@@ -134,8 -136,9 +136,9 @@@
  
          # try to pull out the aliased entity here...
          ua_2 = q2._entities[0].entity_zero.entity
 -        eq_(list(q2.values(ua_2.id, ua_2.name)), [(9, u'fred')])
 +        eq_(list(q2.values(ua_2.id, ua_2.name)), [(9, 'fred')])
  
+     @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported")
      def test_orm_join(self):
          from sqlalchemy.orm.util import join