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

Change-Id: Ie39818413240e21b9fc2aa36009681c39f30dfb8
11 files changed