Commit 585094cc4638fafe1884bb6f4c2fa291e8111222

Carlos Martín Nieto 2015-03-25T02:22:42

Merge pull request #3017 from ethomson/leaks squash some leaks