grim/convey

grim/convey/
Merge docs (the right way?).
auto-split
2017-09-25, Eric Fritz
e4cae873f437