Merge branch 'master' into my
* It seems upstream finally made a decision on replaces and conflicts
Fix pgtk build
You can also use your local clone with git send-email.