grim/convey

grim/convey/
Merge upstream

2017-09-20, Eric Fritz
e8401b751c4d