JBIDE-14867 - Making Denis' changes to beta2x branch
Merge pull request #46 from bfitzpat/JBIDE-14867

JBIDE-14867 - Making Denis' changes to beta2x branch