merging branch from Arnaud Deman, warning about version, it's based on 2.6.05, not on 2.6.08