Merge pull request #3040 from xmcclure/debugger-step-recursive