MFC: r209138
Update a branch missed in r207537 (committed to stable/8 in r207890).
Approved by: re (kib)