Merge branch 'master' into feature/logging

Conflicts:
	changelog.md
	lib/dialects/postgres/query.js
Fix the tests