firefox: merge: version bump