Plankonfig

Merge proposals dependent on lp://staging/~codygarver/plankonfig/updated-and-english

  1. updated-and-english
  2. Dependent merge proposals

lp://staging/~codygarver/plankonfig/updated-and-english has no merge proposals.