Merge proposals dependent on lp://staging/~per.j/iterm/trunk

lp://staging/~per.j/iterm/trunk has no merge proposals.