Merged in efritz/convey/replace-stage (pull request #27)

2017-10-04, Gary Kramlich