Merge remote-tracking branch 'origin/master' into testing

Conflicts:
	wiki/src/doc/about/features.fr.po
	wiki/src/doc/first_steps/upgrade.pt.po
	wiki/src/support/known_issues.de.po
	wiki/src/support/known_issues.fr.po
	wiki/src/support/known_issues.mdwn
	wiki/src/support/known_issues.pt.po