Merge branch 'master' into fdw_select_simple

diff --cc doc/src/sgml/ref/psql-ref.sgml
Simple merge

diff --cc src/bin/psql/command.c
Simple merge

diff --cc src/bin/psql/describe.c
Simple merge

diff --cc src/bin/psql/describe.h
Simple merge