Updated French translation
Fixed two bugs
Fixed warnings
Merge remote-tracking branch 'origin/master' into features/redirects