2ba2c913b5
MFC after: 3 days X-MFC-to: stable/10, stable/9 Reported by: gjb Discussed with: jelischer, gjb, bdrewery
MFC after: 3 days X-MFC-to: stable/10, stable/9 Reported by: gjb Discussed with: jelischer, gjb, bdrewery