Merge branch 'cfg' into future

Conflicts:
	src/volt/errors.d