Merging in version bump NO BUG
Merging in branding changes NO BUG CLOSED TREE ba=release
Merging in l10n changes NO BUG CLOSED TREE ba=release