Fix/work around for https://bugs.eclipse.org/bugs/show_bug.cgi?id=538479

Change-Id: Ic0bf15ef9605af52de3359dabf823fdbb0bb3d85
3 files changed