Merged in efritz/convey/env-loop (pull request #21)

2017-09-26, Gary Kramlich