HGKeeper

3c9c77b80a6c

Merge the release-2.x.y branch into default.

A few manual merges... nothing too bad.

VOID:POINTER,POINTER,OBJECT

BOOLEAN:OBJECT,POINTER,STRING

VOID:STRING,STRING

VOID:STRING,STRING,DOUBLE

VOID:ENUM,STRING,STRING

VOID:ENUM,STRING,STRING,BOOLEAN

VOID:FLAGS,FLAGS

VOID:STRING,STRING,OBJECT,OBJECT