Cleanup code (patch from Preeteesh)
Authored by: bruno.herbelin@gmail.com 2013-04-01
Parent: [r582]
Child: [r584]