Updated bundle.
Updated bundle.
Updated bundle.
Updated bundle.
merged upstream