grim/convey

Merge.
cleanup-on-signal
2017-10-14, Eric Fritz
1966939175c1
Merge.
Gary Kramlich <grim@reaperworld.com>
Keith Petkus <keith@keithp.net>
Eric Fritz <eric@eric-fritz.com>
Erik Davidson <erik@erikd.org>
Anatzum