Marek,

when merging next into master you will hit a number of conflicts (as you
already realized).
Here you have the diff showing how I solved them.

I hope it can help.


Cheers,


-- 
Antonio Quartulli