Merge pull request #1412 from esdrubal/stackframe