Merge branch 'master' into perl-threads