Update repo with recent upstream