Make two code snippets a valid Perl code
Merge branch 'Xaerxess-patch-1' into devel