...
Merge branch 'master' into stable
use perl 5.8, breaks under 5.6