I always feel awkward about taking someone else's code, making it pass commit checks, and submitting it as my own, but in the interest of getting this merged, there it is