Merge proposals dependent on lp://staging/~apathy-coders/apathy/trunk

lp://staging/~apathy-coders/apathy/trunk has no merge proposals.