Merge backtrace-universal. Closes #681