The fix for #1042 (closed) , plus fixes for some other leaks I noticed along the way.
/cc @romangg @ofourdan
