Merge branch 'master' into testing

Conflicts:
	wiki/src/doc/first_steps/bug_reporting.pt.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
	wiki/src/doc/first_steps/persistence/configure.fr.po
	wiki/src/doc/first_steps/persistence/configure.pt.po
	wiki/src/support/known_issues.fr.po