Merge branch 'master' into jsonb_and_hstore

Conflicts:
	src/include/catalog/pg_amproc.h

diff --cc src/include/catalog/pg_amproc.h
index a1aab6ec7156fcea504203fa50a279a3d96e4237,e3773e97593457eb1052739d1e2b47c8a5017598..04edd985ebda7a07c9b1ec5a2b1b8e8baa0a2842
--- 1/src/include/catalog/pg_amproc.h
--- 2/src/include/catalog/pg_amproc.h
+++ b/src/include/catalog/pg_amproc.h
@@@ -358,14 -386,8 +388,15 @@@ DATA(insert (    3659   3614 3614 2 3656 )
  DATA(insert ( 3659   3614 3614 3 3657 ));
  DATA(insert ( 3659   3614 3614 4 3658 ));
  DATA(insert ( 3659   3614 3614 5 2700 ));
 -
+ DATA(insert ( 3659   3614 3614 6 3921 ));
 +DATA(insert ( 4036   3802 3802 1 3480 ));
 +DATA(insert ( 4036   3802 3802 2 3482 ));
 +DATA(insert ( 4036   3802 3802 3 3483 ));
 +DATA(insert ( 4036   3802 3802 4 3484 ));
 +DATA(insert ( 4037   3802 3802 1 351 ));
 +DATA(insert ( 4037   3802 3802 2 3485 ));
 +DATA(insert ( 4037   3802 3802 3 3486 ));
 +DATA(insert ( 4037   3802 3802 4 3487 ));
  
  /* sp-gist */
  DATA(insert ( 3474   3831 3831 1 3469 ));

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

diff --cc src/test/regress/expected/opr_sanity.out
Simple merge