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

Change-Id: Id0760122758b74ad7cb80fa77b72e64337f6b624
15 files changed