Merged in efritz/convey/expand-list (pull request #26)

2017-10-04, Gary Kramlich