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

Change-Id: Ibaed2167dc1105e5a8b1b55f9052bbaaf2b6b221
9 files changed