grim/convey

Merge with replace-stage branch.
expand-list
2017-10-03, Eric Fritz
ac2ec4fef0a1
Merge with replace-stage branch.
Gary Kramlich <grim@reaperworld.com>
Keith Petkus <keith@keithp.net>
Eric Fritz <eric@eric-fritz.com>
Erik Davidson <erik@erikd.org>
Anatzum