Other maintainers might disagree but personally I won't merge this until this is submitted upstream.