Merge remote-tracking branch 'dleslie/faster-output-handling'