Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=540082

Change-Id: Ib46f7c4d17cdef5c4676f1110954b89c2c2fb213
4 files changed