Merge remote-tracking branch 'origin/master' into new/bug_6679

Conflicts:
	catalogue/showmarc.pl

diff --cc catalogue/showmarc.pl
index 2761800,a54894b..32ea2f6
--- 1/catalogue/showmarc.pl
--- 2/catalogue/showmarc.pl
+++ b/catalogue/showmarc.pl
@@@ -25,7 -23,8 +23,8 @@@
  use strict;
  #use warnings; FIXME - Bug 2505
  
 -use open OUT=>':utf8', ':std';
 +use open OUT=>":encoding(UTF-8)", ':std';
+ 
  # standard or CPAN modules used
  use CGI qw(:standard);
  use DBI;