Add stream index to errors#34

Oligrand wants to merge 3 commits intomafintosh:mastermafintosh/pump:masterfrom

Oligrand:add-stream-index-to-errorsOligrand/pump:add-stream-index-to-errorsCopy head branch name to clipboard