Merge commit '5eb18e8576462f5bb33fbd60fcbd752fe5791f33'
MFC after: 3 days
Ideally upstream would have added a comment here