Merge pull request #2216 from akallabeth/memleak_fix
authorMartin Fleisz <martin.fleisz@thincast.com>
Mon, 17 Nov 2014 11:07:00 +0000 (12:07 +0100)
committerMartin Fleisz <martin.fleisz@thincast.com>
Mon, 17 Nov 2014 11:07:00 +0000 (12:07 +0100)
Various bug fixes


Trivial merge