Merge proposals dependent on lp://staging/~alexlauni/groundcontrol/bugfix-lp-520613

lp://staging/~alexlauni/groundcontrol/bugfix-lp-520613 has no merge proposals.