If you end up rebasing, I'd suggest a quick whitespace cleanup with `g rebase scala/master --whitespace=fix`. There's some trailing whitespace errors introduced in uncurry, for examle.