Bring my fork up-to-date with upstream