attempted fix for eclipse luna's equinox
Merge branch 'eqfix'
updated version number, because this fix seems to work.