Merge branch 'pr182'

diff --cc doc/build/changelog/changelog_10.rst
index e37fc46c79fc9feeacaf9367b28bbbe4759dc8e4,155302388aed169e09f71a51029f507281dd0b28..f4c1d215d2812ff15aca9f69c0368b6ec8816a74
--- 1/doc/build/changelog/changelog_10.rst
--- 2/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@@ -18,16 -18,17 +18,27 @@@
  .. changelog::
      :version: 1.0.6
  
+     .. change::
+         :tags: feature, postgresql
+         :pullreq: github:182
+ 
+         Added new execution option ``max_row_buffer`` which is interpreted
+         by the psycopg2 dialect when the ``stream_results`` option is
+         used, which sets a limit on the size of the row buffer that may be
+         allocated.  This value is also provided based on the integer
+         value sent to :meth:`.Query.yield_per`.  Pull request courtesy
+         mcclurem.
+ 
 +    .. change::
 +        :tags: bug, orm
 +        :tickets: 3451
 +        :pullreq: github:181
 +
 +        Fixed bug in new :meth:`.Session.bulk_update_mappings` feature where
 +        the primary key columns used in the WHERE clause to locate the row
 +        would also be included in the SET clause, setting their value to
 +        themselves unnecessarily.  Pull request courtesy Patrick Hayes.
 +
      .. change::
          :tags: bug, orm
          :tickets: 3448