Merge pull request #2553 from akallabeth/leak_fixes
authorBernhard Miklautz <bmiklautz@users.noreply.github.com>
Tue, 21 Apr 2015 14:49:02 +0000 (16:49 +0200)
committerBernhard Miklautz <bmiklautz@users.noreply.github.com>
Tue, 21 Apr 2015 14:49:02 +0000 (16:49 +0200)
Leak fixes


Trivial merge