Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4