It seems you fixed the leak problem with this PR, wanna rebase on top of master so I can merge after travis confirmation?