Fixes a memory leak.
Merge branch 'master' into zambiorix-master