Rebase to latest master and fix conflicts (and use right email)