Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=576451Change-Id: I58cc89a14c0d9adf98c70a66d9ed3cc2f7b6be44