PR: kern/36692 Submitted by: Theo van Klaveren <t.vanklaveren@student.utwente.nl> Approved by: re (murray) MFC After: 3 days