This PR is against -next anyway so gkz told me (a few comments before) he'd just pick the file. (-fr.html)