grim/convey

grim/convey/
closing merged branch
cleanup-on-signal
2017-10-15, Gary Kramlich
dec86e573484