Merge branch 'master' into cmake

Conflicts:
	Makefile
Merge branch 'cmake' of github.com:mschoenlaub/mongo-c-driver into cmake

Conflicts:
	Makefile