Lets merge it from upstream :)

Latest puppet-postgresql