gplugin/gplugin

merging
develop
2018-05-07, Gary Kramlich
e7100985be3f
merging
[branchname]
master = default
develop = develop
feature = feature/
release = release/
hotfix = hotfix/
support = support/