gplugin/gplugin

gplugin/gplugin/
merge these diverged branches together
feature/gtk-doc
2018-05-07, Gary Kramlich
d92f986ed621