Merge branch 'master' into two-dot-o

Conflicts:
	stack/query-validator/pom.xml