rebased onto 059616585c9d026ac96bf6d5a490a9b4a3779de5
Ahah, good one :)
Since it's not covered in the unit-tests, I'm going to merge this directly.
Thanks!
Pull-Request has been merged by pingou