PR #408 needs applying to the new toolchain (master)

[inclement]

See #408

Want to back this issue? Post a bounty on it! We accept bounties via Bountysource.

[inclement]

I never did this, but it's been a long time and nobody seemed to miss it much, so closing.