Merge branch 'next' into ql-refactor

Conflicts:
	src/build.mk
Merge branch 'ql-refactor' into sam_ql_refactor