Merge remote-tracking branch 'origin/pr/147' into pr147

Conflicts:
	lib/sqlalchemy/orm/query.py

diff --cc lib/sqlalchemy/orm/query.py
index 60a6379521c04cc18eb67dbf2d66916cbd1a0300,c651812bd3b72ea2ab0b699fd70d12bafec0cb10..3680f47eb713aeac1090bb214d10ec84e71e255c
--- 1/lib/sqlalchemy/orm/query.py
--- 2/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@@ -1770,15 -1757,12 +1770,15 @@@ class Query(object)
              SQLAlchemy versions was the primary ORM-level joining interface.
  
          """
 -        aliased, from_joinpoint = kwargs.pop('aliased', False),\
 -            kwargs.pop('from_joinpoint', False)
 +        aliased, from_joinpoint, isouter = kwargs.pop('aliased', False),\
 +            kwargs.pop('from_joinpoint', False),\
 +            kwargs.pop('isouter', False)
          if kwargs:
 -            raise TypeError("unknown arguments: %s" % ', '.join(kwargs))
 +            raise TypeError("unknown arguments: %s" %
-                             ','.join(kwargs.keys))
++                            ','.join(kwargs))
 +        isouter = isouter
          return self._join(props,
 -                          outerjoin=False, create_aliases=aliased,
 +                          outerjoin=isouter, create_aliases=aliased,
                            from_joinpoint=from_joinpoint)
  
      def outerjoin(self, *props, **kwargs):