gplugin/gplugin

gplugin/gplugin/plugins/
merging
develop
2015-06-30, Gary Kramlich
66d0e91ffa49