gplugin/gplugin

merging
develop
2015-06-30, Gary Kramlich
66d0e91ffa49
merging
BOOLEAN:OBJECT,POINTER
VOID:ENUM,ENUM
VOID:INT,INT
VOID:OBJECT