Please avoid noisy merge commits in frameworks

[Stephen Kelly]

Stephen Kelly wrote:

> 
> Hi there,
> 
> I was reviewing the changes in the frameworks branch from yesterday.
> Something I noticed was that there are a lot of merge commits that don't
> need to exist.

Ugh. Yet more of this just appeared... Recent history in the frameworks 
branch looks far more complex than it is and is harder to follow.

There are too many people unaware that they're doing it maybe...