Merge remote-tracking branch 'origin/feature/8028-remove-unsafe-browser-test-menu-workaround' into stable
Merge branch 'stable' into devel
Revert "Install Florence from Debian unstable (partly addresses #8010)."

This reverts commit 377e05c7aca55b0f48f007a570f3eb3142c7c144.

We don't use the floating icon anymore, so we can as well ship whatever is
in Jessie.
Don't install monkeysphere for the time being.

It's been removed from testing due to a RC bug, and it's not as if it was very
much used in Tails.
Merge remote-tracking branch 'origin/devel' into feature/jessie