GUVNOR-1989
Merge pull request #24 from nheron/GUVNOR-1989_5.5.x

GUVNOR-1989