Merge-forward (1.1 => master)