Merge pull request #825 from mattrjacobs/0.16.x

Issue #799 - Commenting out the call to attachCallingThreadStack when co...