Dne 2.8.2016 v 16:57 Florian Festi napsal(a): > I just merged the Mark Wielaars' patches upstream. Even with this merge > patch things do not apply cleanly. Can you just rebase on top of master, > please? Will do. Michal