Merge pull request #124 from mtemenos/master

Fixing Spring PRD test failure.
Merge branch 'master' of https://github.com/temenostech/IRIS