Leak

It's my ultimate goal at the moment to merge this and release a new version. Because of Changes file it's based on top of releng-fixes branch (sent pull request a few minutes ago) and should be merged after.

I can take care of release if you give me co-maint.