Code

Merge branch 'tr/die_errno'