Ben Dätwyler

@asm0deuz There is only 1 commit from me, all others are because the branch got out of sync and I had to merge the upstream diffs.

@asm0deuz Could you please clarify what is taking so long? With the time more merge conflicts will inevitably appear. And if you, as per your last comment, do not want...

@asm0deuz Rebased to match devel, tests are passing.

@asm0deuz This is exactly what was done, but due to the long wait there will be the merge conflict somewhere, we cannot forgo it. :) As you seem unhappy with...