Merge proposals dependent on lp://staging/~chrisccoulson/indicator-appmenu/ffox-fixes

lp://staging/~chrisccoulson/indicator-appmenu/ffox-fixes has no merge proposals.