Fixing ESBJAVA-3183.
Merge remote-tracking branch 'upstream/master'
Merge pull request #63 from iuj/master

Fixing ESBJAVA-3183.