grim/convey

674d936a6785
ChangeLog the fixes from pr #25. Fixes #125, #126
environment:
- source=global-override