Merge "API: Restore ability for dieStatus() to be passed a non-fatal Status"