09ff71d357
PR: 217505 Submitted by: John O. Brickley <obryan.brickley@gmail.com>, updated by Maciej Pasternacki <maciej@pasternacki.net> Reported by: John O. Brickley <obryan.brickley@gmail.com> MFC after: 1 week