Merge remote-tracking branch 'upstream/release' into iceweasel_release
Fix make package
ICEWEASEL_153_0_BUILD1
Small change
Update preferences.ftl