grim/convey

grim/convey/
ChangeLog the PR's I merged earlier

2017-10-13, Gary Kramlich
17896e884980