Sylvain Petreolle
committed
on 10 Sep
[RAPPS]
Include cleanup. Patch by sanchaez+small changes by me.