Merge pull request #49 from jblowe/master

PAHMA-930, PAHMA-926, PAHMA-811: fieldsets in KIR/OIR, handler update, o...