[Tails-dev] 1.4: Merged stuff that had no pull request

TrådSkribentDato ()
Mintrigeri