4.7 mergable into frameworks. No need to cherry-pick

[Stephen Kelly]

Hi,

I merged the 4.7 branch into frameworks recently. Now it's easy to merge 
again, so no need to cherry-pick when you fix things in 4.7. You can merge 
instead.

Thanks,

Steve.