merge tip + tidy

diff --cc test/orm/test_dynamic.py
index 9b57d3fd671383675dcbc127b9d84763688e2643,037a2db6414a7e901abd807b6e8f900456c66e29..215a752391c1398d60cd02a1029c44edb6d2f736
--- 1/test/orm/test_dynamic.py
--- 2/test/orm/test_dynamic.py
+++ b/test/orm/test_dynamic.py
@@@ -191,6 -191,7 +191,9 @@@ class DynamicTest(_fixtures.FixtureTest
          assert o1 in i1.orders.all()
          assert i1 in o1.items.all()
  
 -    @testing.exclude('mysql', 'in', ((5, 1,49), (5, 1, 50), (5, 1, 51), (5, 1, 52)), 'https://bugs.launchpad.net/ubuntu/+source/mysql-5.1/+bug/706988')
++    @testing.exclude('mysql', 'in', 
++            ((5, 1,49), (5, 1, 50), (5, 1, 51), (5, 1, 52)),
++            'https://bugs.launchpad.net/ubuntu/+source/mysql-5.1/+bug/706988')
      def test_association_nonaliased(self):
          items, Order, orders, order_items, Item = (self.tables.items,
                                  self.classes.Order,
@@@ -210,8 -211,8 +213,10 @@@
  
          self.assert_compile(
              o.items,
--            "SELECT items.id AS items_id, items.description AS items_description FROM items,"
--            " order_items WHERE :param_1 = order_items.order_id AND items.id = order_items.item_id"
++            "SELECT items.id AS items_id, items.description AS "
++            "items_description FROM items,"
++            " order_items WHERE :param_1 = order_items.order_id AND "
++            "items.id = order_items.item_id"
              " ORDER BY order_items.item_id",
              use_default_dialect=True
          )