fresh rebase

+ commit message of first patch contains link to related article on wiki.postgresql.org

Regards

Pavel