desktopcouch

Merge proposals dependent on lp://qastaging/~thisfred/desktopcouch/fix-linux-detection

  1. fix-linux-detection
  2. Dependent merge proposals

lp://qastaging/~thisfred/desktopcouch/fix-linux-detection has no merge proposals.