[Tails-dev] review and merge

ThreadAuthorDate ()
Msajolida
Mintrigeri
Msajolida
Mintrigeri
Msajolida