Make trace and doctest play nice together (issue 1429818).  Will backport.
2 files changed