A simpler approach for reducing output clutter. Closes #158.
Merge remote-tracking branch 'upstream/master' into linux-multiarch