Merge branch 'develop' into GeoIP2

diff --cc wwwroot/cgi-bin/awstats.model.conf
index ec448cd9e8773ef7063c9a45d561fc08a93d7746,04c2dd55fcf036c69950a0ee58790ed6a0d08bfa..95a7fe54388a96894a9242dcb6a6d14467de165e
--- 1/wwwroot/cgi-bin/awstats.model.conf
--- 2/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@@ -176,12 -176,13 +176,13 @@@ HostAliases="localhost 127.0.0.1 REGEX[
  # With DNSLookup to 0, all hosts will be reported by their IP addresses and
  # not by the full hostname of visitors (except if names are already available
  # in log file).
- # If you want/need to set DNSLookup to 1, don't forget that this will reduce
- # dramatically AWStats update process speed. Do not use on large web sites.
+ # If you want/need to set DNSLookup to 1, don't forget that this will
+ # dramatically reduce AWStats's update process speed. Do not use on large web
+ # sites.
  # Note: Reverse DNS lookup is done on IPv4 only (Enable ipv6 plugin for IPv6).
  # Note: Result of DNS Lookup can be used to build the Country report. However
 -# it is highly recommended to enable the plugin 'geoip' or 'geoipfree' to
 -# have an accurate Country report with no need for DNS Lookup.
 +# it is highly recommanded to enable the plugin 'geoip', 'geoipfree', or 'geoip2'
- # to have an accurate Country report with no need of DNS Lookup.
++# to have an accurate Country report with no need for DNS Lookup.
  # Possible values:
  # 0 - No DNS Lookup
  # 1 - DNS Lookup is fully enabled

diff --cc wwwroot/cgi-bin/awstats.pl
Simple merge