Merge pull request #3351 from ccin2p3/f/write_riemann-memleak