Merging all fixes for 2.9

[Cyrille Berger]

On 2015-01-19 22:35, Inge Wallin wrote:
> On Monday, January 19, 2015 17:25:33 Inge Wallin wrote:
>> On Monday, January 19, 2015 17:26:45 Boudewijn Rempt wrote:
>> > If you do, I think it should be an ordinary merge, not a squash.
>> 
>> yes, agree.
> 
> Done.  It went totally without problems.
> 
> I think we should do this every 3-5 days at least so that we don't end 
> up with
> a big problem that will be difficult to unwind later.

That was the original plan, but nobody had the time to do it until now I 
guess :) And that is also why we "froze" master.

-- 
Cyrille Berger Skott