Try to solve post-merge conflicts.
Merge remote branch 'origin/JH-output' into JH-output

Conflicts:
	src/io/output.h