Add some template helpers to stream, fix some whitespace (tabs)
Merge commit '933cf18404062207f781ad22fc8ecedf28442a88'