grim/convey

Merged in efritz/convey (pull request #25)

2017-10-04, Gary Kramlich
cf13ffd0f7c7
Merged in efritz/convey (pull request #25)

Fix concurrent state modification

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