Bring branch up-to-date with trunk