grim/convey

merging

2018-02-11, Gary Kramlich
35cb993e3262
merging
Gary Kramlich <grim@reaperworld.com>
Keith Petkus <keith@keithp.net>
Eric Fritz <eric@eric-fritz.com>
Erik Davidson <erik@erikd.org>
Anatzum