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

Change-Id: Ib7e358964e8d41c1d75866596458007060655ec2
5 files changed