Merge "Fixing Eclipse settings file"