Raise timeout, again.
Merge branch 'devel' of git://git.tails.boum.org/tails into devel