[Tails-dev] Merges from Redmine: #5648, #7252

ThreadAutorDatum (-000)
Mintrigeri2014-08-04 15:44