Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/netutils.c

1 files changed, 2 insertions, 0 deletions

diff --git a/test.pl.in b/test.pl.in
index 01a97ec0..2f2c44f2 100755
--- a/test.pl.in
+++ b/test.pl.in
@@ -9,6 +9,8 @@ use Getopt::Long;
 
 use NPTest qw(DetermineTestHarnessDirectory TestsFrom);
 
+$ENV{LC_ALL} = 'C';
+
 my @tstdir;
 
 if ( ! GetOptions( "testdir:s" => \@tstdir ) )