grim/gplugin

grim/gplugin/
Merge in latest changes
develop
2020-02-25, Richard Laager
3feea9199e7e