Merge branch 'master' into geometrySupport

Conflicts:
	lib/adapter.js
	lib/query.js
	lib/utils.js
	package.json