Explicitly request TM_ERROR_FD for stack trace/error output
Merge remote-tracking branch 'upstream/master'