Backport of #902 to master
Merge pull request #904 from jonhyman/feature/pipelines

Backport of #902 to master