Merge with changes on mozfr.org