Merge branch 'master' into anyevent

Conflicts:
	data/cty.dat
	data/prefix_data.pl
	perl/Version.pm

diff --cc perl/Version.pm
index ca438058c3cb7bd39658ee8423eaab67f40b74b4,aa4f82fc910c84696207391aca0c298914aa6573..1c31c2164311114a2a4e73c1648a22a37ba4e67a
--- 1/perl/Version.pm
--- 2/perl/Version.pm
+++ b/perl/Version.pm
@@@ -9,9 -9,9 +9,9 @@@ package main
  
  use vars qw($version $subversion $build $gitversion);
  
 -$version = '1.55';
 +$version = '1.56';
  $subversion = '0';
- $build = '19';
- $gitversion = '6d73d85';
 -$build = '104';
 -$gitversion = '4cb816f';
++$build = '20';
++$gitversion = '85eea0e';
  
  1;