gplugin/gplugin

gplugin/gplugin/
Bring this up to date with develop
feature/gtk-doc
2018-05-05, Gary Kramlich
7dffe2b18c29