Bring fork up-to-date with latest parent (1.2)