Merge upstream#12

ants wants to merge 2 commits intomultisitecybertec-postgresql/patroni:multisitefrom

multisite-trackingcybertec-postgresql/patroni:multisite-trackingCopy head branch name to clipboard