gplugin/gplugin

merging develop into feature/gjs-cc
feature/gjs-cc
2018-05-06, Gary Kramlich
7a82b93db2f8
merging develop into feature/gjs-cc
BOOLEAN:OBJECT,POINTER
VOID:ENUM,ENUM
VOID:INT,INT
VOID:OBJECT