These merge commits were added into this branch cleanly.

There are no new changes to show.