Fix warnings in Perl 5.18.1
Merge branch 'master' into 'python'