On Tue, 2017-02-21 at 10:26 +0200, Jani Nikula wrote: > You know how this stuff works, please split it up to get the stuff > merged. Quite well actually. Fix it as you think appropriate. But in any case, fix it.