Merge "Add ON CONFLICT support for Postgresql"

diff --cc doc/build/changelog/changelog_11.rst
index 923148232d1f6af5fe9560d2fb1f92b64f8a0373,6151ec3ffe5dff6326d50c3eeddebce3f899b8ca..662bad00aa6eb568b63ac7ed940ac4252d25ac21
--- 1/doc/build/changelog/changelog_11.rst
--- 2/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@@ -21,14 -21,18 +21,26 @@@
  .. changelog::
      :version: 1.1.0b1
  
 +    .. change::
 +        :tags: bug, sql
 +        :tickets: 3724
 +
 +        :meth:`.FromClause.count` is deprecated.  This function makes use of
 +        an arbitrary column in the table and is not reliable; for Core use,
 +        ``func.count()`` should be preferred.
 +
+     .. change::
+         :tags: feature, postgresql
+         :tickets: 3529
+ 
+         Added support for Postgresql's INSERT..ON CONFLICT using a new
+         Postgresql-specific :class:`.postgresql.dml.Insert` object.
+         Pull request and extensive efforts here by Robin Thomas.
+ 
+         .. seealso::
+ 
+             :ref:`change_3529`
+ 
      .. change::
          :tags: feature, postgresql
          :pullreq: bitbucket:84