GTG

Merge proposals dependent on lp://staging/~gtg-user/gtg/bugfix-493335

lp://staging/~gtg-user/gtg/bugfix-493335 has no merge proposals.