Perl 5.20 doesn't like replacing stuff on an undefined value.
Merge branch 'public/7.8' into public/7.9