Merge pull request #3422 from xmcclure/tarjan-doublefan