gplugin/gplugin

gplugin/gplugin/
Merging
develop
2017-06-09, Gary Kramlich
40254f85f921