Merge pull request #2278 from octo/ff/perl