Merge branch 'master' into sync-logging

Conflicts:
	lib/query-interface.js