Fix yet another bug in pg_restore part
Merge branch 'master' into for_puppet