Merge "Add workaround for the Eclipse+Mountain Lion bug"