Merge branch 'master' into pgstat2
Merge remote branch 'remotes/postgres2/pgstat2' into pgstat2