- Add workaround for symlink/directory conflict (bz 2097773) - Modify the jmol patch to timeout after 5 minutes. This is a workaround for recently observed jmol hangs, but is not a proper fix.