Manual merge with upstream as of 2017-07-25#9

mcd-php wants to merge 1 commit intoDanielDent:masterDanielDent/docker-postgres-replication:masterfrom

mcd-php:mastermcd-php/docker-postgres-replication:masterCopy head branch name to clipboard