Merged in efritz/convey/empty-vars (pull request #35)

2017-10-13, Gary Kramlich