Rebase from 'upstream' (no changes)