@xuu Merged!

@prologic@twtxt.net @xuu Hmm, looks like this fix was based on my unsuccessful attempt to repair it, hence heaps of tests are failing when I run make test. I will look into that.