Merge branch 'flameshot-org-master' into feature/RND-656-flameshot-ability-to-lock-switching-between-s3-and-imgur-and-use-s3-only

# Conflicts:
#	data/translations/Internationalization_eu.ts