JBIDE-13209 to 4.0.x
Merge pull request #6 from robstryker/JBIDE-13209_4.0.x

JBIDE-13209 to 4.0.x