grim/convey

4ff734b355fd
Merged in efritz/convey/replace-stage (pull request #27)

Merge plans when extending

Approved-by: Gary Kramlich
Gary Kramlich <grim@reaperworld.com>
Keith Petkus <keith@keithp.net>
Eric Fritz <eric@eric-fritz.com>
Erik Davidson <erik@erikd.org>
Anatzum