warnings
Perl 5.8 compat
auto-merge staging into master