Merge branch 'master' into slot2
authorRobert Haas <[email protected]>
Thu, 30 Jan 2014 18:38:52 +0000 (13:38 -0500)
committerRobert Haas <[email protected]>
Thu, 30 Jan 2014 18:38:52 +0000 (13:38 -0500)

Trivial merge