Merge commit 'c632ac480e6fffc79c32845a34488574fc5bc685'

Conflicts:
	Makefile
	README.md
	mongo_fdw.c
	mongo_query.c