Merge branch 'master' of git://git.postgresql.org/git/postgresql into fdw_select_simple

diff --cc src/backend/commands/analyze.c
Simple merge

diff --cc src/backend/nodes/copyfuncs.c
Simple merge

diff --cc src/backend/nodes/equalfuncs.c
Simple merge

diff --cc src/backend/nodes/outfuncs.c
Simple merge

diff --cc src/backend/optimizer/plan/createplan.c
Simple merge

diff --cc src/backend/optimizer/plan/subselect.c
Simple merge

diff --cc src/backend/optimizer/prep/prepunion.c
Simple merge

diff --cc src/backend/optimizer/util/pathnode.c
Simple merge

diff --cc src/backend/parser/analyze.c
Simple merge

diff --cc src/include/catalog/pg_proc.h
Simple merge

diff --cc src/include/nodes/parsenodes.h
Simple merge