Merge branch 'master' into slot2
authorRobert Haas <[email protected]>
Thu, 30 Jan 2014 17:31:25 +0000 (12:31 -0500)
committerRobert Haas <[email protected]>
Thu, 30 Jan 2014 17:31:25 +0000 (12:31 -0500)

Trivial merge