gplugin/gplugin

gplugin/gplugin/
Merging
develop
2019-01-26, Gary Kramlich
f1511cc83ae5