Commit fac42ff9426fccff4a6781fc5678b12e18326fe8

Patrick Steinhardt 2016-02-08T16:58:08

merge: fix memory leak