There's a lot in this diff that is in master...is this up to date?