GTG

Merge proposals dependent on lp://staging/~khaeru/gtg/bugfix-lp-529194

lp://staging/~khaeru/gtg/bugfix-lp-529194 has no merge proposals.