GRECLIPSE-1773 Fix and test
GRECLIPSE-1773 Fix for broken tests
GRECLIPSE-1773 Comment added
Merge pull request #86 from DenisMurashev/GRECLIPSE-1773

GRECLIPSE-1773 Possible fix