Merge pull request #3252 from xmcclure/tarjan-opt-basic