Updated settings.jar after the latest merges