diff --git a/daemon/remote.c b/daemon/remote.c
index c066fc9de..49392265b 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -762,6 +762,8 @@ print_stats(SSL* ssl, const char* nm, struct stats_info* s)
 	struct timeval avg;
 	if(!ssl_printf(ssl, "%s.num.queries"SQ"%lu\n", nm, 
 		(unsigned long)s->svr.num_queries)) return 0;
+	if(!ssl_printf(ssl, "%s.num.queries_ip_ratelimited"SQ"%lu\n", nm,
+		(unsigned long)s->svr.num_queries_ip_ratelimited)) return 0;
 	if(!ssl_printf(ssl, "%s.num.cachehits"SQ"%lu\n", nm, 
 		(unsigned long)(s->svr.num_queries 
 			- s->svr.num_queries_missed_cache))) return 0;
@@ -2559,6 +2561,8 @@ struct ratelimit_list_arg {
 	time_t now;
 };
 
+#define ip_ratelimit_list_arg ratelimit_list_arg
+
 /** list items in the ratelimit table */
 static void
 rate_list(struct lruhash_entry* e, void* arg)
@@ -2577,6 +2581,24 @@ rate_list(struct lruhash_entry* e, void* arg)
 	ssl_printf(a->ssl, "%s %d limit %d\n", buf, max, lim);
 }
 
+/** list items in the ip_ratelimit table */
+static void
+ip_rate_list(struct lruhash_entry* e, void* arg)
+{
+	char ip[128];
+	struct ip_ratelimit_list_arg* a = (struct ip_ratelimit_list_arg*)arg;
+	struct ip_rate_key* k = (struct ip_rate_key*)e->key;
+	struct ip_rate_data* d = (struct ip_rate_data*)e->data;
+	int lim = infra_ip_ratelimit;
+	int max = infra_rate_max(d, a->now);
+	if(a->all == 0) {
+		if(max < lim)
+			return;
+	}
+	addr_to_str(&k->addr, k->addrlen, ip, sizeof(ip));
+	ssl_printf(a->ssl, "%s %d limit %d\n", ip, max, lim);
+}
+
 /** do the ratelimit_list command */
 static void
 do_ratelimit_list(SSL* ssl, struct worker* worker, char* arg)
@@ -2595,6 +2617,24 @@ do_ratelimit_list(SSL* ssl, struct worker* worker, char* arg)
 	slabhash_traverse(a.infra->domain_rates, 0, rate_list, &a);
 }
 
+/** do the ip_ratelimit_list command */
+static void
+do_ip_ratelimit_list(SSL* ssl, struct worker* worker, char* arg)
+{
+	struct ip_ratelimit_list_arg a;
+	a.all = 0;
+	a.infra = worker->env.infra_cache;
+	a.now = *worker->env.now;
+	a.ssl = ssl;
+	arg = skipwhite(arg);
+	if(strcmp(arg, "+a") == 0)
+		a.all = 1;
+	if(a.infra->client_ip_rates==NULL ||
+		(a.all == 0 && infra_ip_ratelimit == 0))
+		return;
+	slabhash_traverse(a.infra->client_ip_rates, 0, ip_rate_list, &a);
+}
+
 /** tell other processes to execute the command */
 static void
 distribute_cmd(struct daemon_remote* rc, SSL* ssl, char* cmd)
@@ -2673,6 +2713,9 @@ execute_cmd(struct daemon_remote* rc, SSL* ssl, char* cmd,
 	} else if(cmdcmp(p, "ratelimit_list", 14)) {
 		do_ratelimit_list(ssl, worker, p+14);
 		return;
+	} else if(cmdcmp(p, "ip_ratelimit_list", 17)) {
+		do_ip_ratelimit_list(ssl, worker, p+17);
+		return;
 	} else if(cmdcmp(p, "stub_add", 8)) {
 		/* must always distribute this cmd */
 		if(rc) distribute_cmd(rc, ssl, cmd);
diff --git a/daemon/stats.c b/daemon/stats.c
index 0687c0d24..a3c3d7389 100644
--- a/daemon/stats.c
+++ b/daemon/stats.c
@@ -102,12 +102,14 @@ void server_stats_log(struct server_stats* stats, struct worker* worker,
 	int threadnum)
 {
 	log_info("server stats for thread %d: %u queries, "
-		"%u answers from cache, %u recursions, %u prefetch", 
+		"%u answers from cache, %u recursions, %u prefetch, %u rejected by "
+		"ip ratelimiting",
 		threadnum, (unsigned)stats->num_queries, 
 		(unsigned)(stats->num_queries - 
 			stats->num_queries_missed_cache),
 		(unsigned)stats->num_queries_missed_cache,
-		(unsigned)stats->num_queries_prefetch);
+		(unsigned)stats->num_queries_prefetch,
+		(unsigned)stats->num_queries_ip_ratelimited);
 	log_info("server stats for thread %d: requestlist max %u avg %g "
 		"exceeded %u jostled %u", threadnum,
 		(unsigned)stats->max_query_list_size,
@@ -226,6 +228,7 @@ void server_stats_reply(struct worker* worker, int reset)
 void server_stats_add(struct stats_info* total, struct stats_info* a)
 {
 	total->svr.num_queries += a->svr.num_queries;
+	total->svr.num_queries_ip_ratelimited += a->svr.num_queries_ip_ratelimited;
 	total->svr.num_queries_missed_cache += a->svr.num_queries_missed_cache;
 	total->svr.num_queries_prefetch += a->svr.num_queries_prefetch;
 	total->svr.sum_query_list_size += a->svr.sum_query_list_size;
diff --git a/daemon/stats.h b/daemon/stats.h
index 6c4178fc5..0b9d77b42 100644
--- a/daemon/stats.h
+++ b/daemon/stats.h
@@ -63,6 +63,8 @@ struct sldns_buffer;
 struct server_stats {
 	/** number of queries from clients received. */
 	size_t num_queries;
+	/** number of queries that have been dropped/ratelimited by ip. */
+	size_t num_queries_ip_ratelimited;
 	/** number of queries that had a cache-miss. */
 	size_t num_queries_missed_cache;
 	/** number of prefetch queries - cachehits with prefetch */
diff --git a/daemon/worker.c b/daemon/worker.c
index 32dd6f9ef..b0c1acf93 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -825,7 +825,29 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 		comm_point_drop_reply(repinfo);
 		return 0;
 	}
+
 	worker->stats.num_queries++;
+
+	/* check if this query should be dropped based on source ip rate limiting */
+	if(!infra_ip_ratelimit_inc(worker->env.infra_cache, repinfo,
+			*worker->env.now)) {
+		/* See if we are passed through with slip factor */
+		if(worker->env.cfg->ip_ratelimit_factor != 0 &&
+			ub_random_max(worker->env.rnd,
+						  worker->env.cfg->ip_ratelimit_factor) == 1) {
+
+			char addrbuf[128];
+			addr_to_str(&repinfo->addr, repinfo->addrlen,
+						addrbuf, sizeof(addrbuf));
+		  verbose(VERB_OPS, "ip_ratelimit allowed through for ip address %s ",
+				  addrbuf);
+		} else {
+			worker->stats.num_queries_ip_ratelimited++;
+			comm_point_drop_reply(repinfo);
+			return 0;
+		}
+	}
+
 	/* see if query is in the cache */
 	if(!query_info_parse(&qinfo, c->buffer)) {
 		verbose(VERB_ALGO, "worker parse request: formerror.");
diff --git a/doc/Changelog b/doc/Changelog
index 152fd4995..c17510516 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	- Fix #1184: Log DNS replies. This includes the same logging
 	  information that DNS queries and response code and response size,
 	  patch from Larissa Feng.
+	- Fix #1185: Source IP rate limiting, patch from Larissa Feng.
 
 3 January 2017: Wouter
 	- configure --enable-systemd and lets unbound use systemd sockets if
diff --git a/doc/example.conf.in b/doc/example.conf.in
index 95f13fa49..1f787016a 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -674,6 +674,20 @@ server:
 	# can give this multiple times, the name closest to the zone is used.
 	# ratelimit-below-domain: com 1000
 
+	# global query ratelimit for all ip addresses.
+	# feature is experimental.
+	# if 0(default) it is disabled, otherwise states qps allowed per ip address
+	# ip-ratelimit: 0
+
+	# ip ratelimits are tracked in a cache, size in bytes of cache (or k,m).
+	# ip-ratelimit-size: 4m
+	# ip ratelimit cache slabs, reduces lock contention if equal to cpucount.
+	# ip-ratelimit-slabs: 4
+
+	# 0 blocks when ip is ratelimited, otherwise let 1/xth traffic through
+	# ip-ratelimit-factor: 10
+
+
 # Python config section. To enable:
 # o use --with-pythonmodule to configure before compiling.
 # o list python in the module-config string (above) to enable.
diff --git a/doc/unbound-control.8.in b/doc/unbound-control.8.in
index a5f74ead0..a2e5f6079 100644
--- a/doc/unbound-control.8.in
+++ b/doc/unbound-control.8.in
@@ -194,7 +194,7 @@ harden\-referral\-path, prefetch, prefetch\-key, log\-queries,
 hide\-identity, hide\-version, identity, version, val\-log\-level,
 val\-log\-squelch, ignore\-cd\-flag, add\-holddown, del\-holddown,
 keep\-missing, tcp\-upstream, ssl\-upstream, max\-udp\-size, ratelimit,
-cache\-max\-ttl, cache\-min\-ttl, cache\-max\-negative\-ttl.
+ip\-ratelimit, cache\-max\-ttl, cache\-min\-ttl, cache\-max\-negative\-ttl.
 .TP
 .B get_option \fIopt
 Get the value of the option.  Give the option name without a trailing ':'.
@@ -280,6 +280,12 @@ just the ratelimited domains, with their estimated qps.  The ratelimited
 domains return an error for uncached (new) queries, but cached queries work
 as normal.
 .TP
+.B ip_ratelimit_list \fR[\fI+a\fR]
+List the ip addresses that are ratelimited.  Printed one per line with current
+estimated qps and qps limit from config.  With +a it prints all ips, not
+just the ratelimited ips, with their estimated qps.  The ratelimited
+ips are dropped before checking the cache.
+.TP
 .B view_list_local_zones \fIview\fR
 \fIlist_local_zones\fR for given view.
 .TP
@@ -319,6 +325,9 @@ The \fIstats\fR command shows a number of statistic counters.
 .I threadX.num.queries
 number of queries received by thread
 .TP
+.I threadX.num.queries_ip_ratelimited
+number of queries rate limited by thread
+.TP
 .I threadX.num.cachehits
 number of queries that were successfully answered using a cache lookup
 .TP
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 516fbdbc3..7cd47a531 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1205,6 +1205,34 @@ in different parts of the namespace.  The closest matching suffix is used
 to determine the qps limit.  The rate for the exact matching domain name
 is not changed, use ratelimit\-for\-domain to set that, you might want
 to use different settings for a top\-level\-domain and subdomains.
+.TP 5
+.B ip\-ratelimit: \fI<number or 0>
+Enable global ratelimiting of queries accepted per ip address.
+If 0, the default, it is disabled.  This option is experimental at this time.
+The ratelimit is in queries per second that are allowed.  More queries are
+completely dropped and will not receive a reply, SERVFAIL or otherwise.
+IP ratelimiting happens before looking in the cache. This may be useful for
+mitigating amplification attacks.
+.TP 5
+.B ip\-ratelimit\-size: \fI<memory size>
+Give the size of the data structure in which the current ongoing rates are
+kept track in.  Default 4m.  In bytes or use m(mega), k(kilo), g(giga).
+The ip ratelimit structure is small, so this data structure likely does
+not need to be large.
+.TP 5
+.B ip\-ratelimit\-slabs: \fI<number>
+Give power of 2 number of slabs, this is used to reduce lock contention
+in the ip ratelimit tracking data structure.  Close to the number of cpus is
+a fairly good setting.
+.TP 5
+.B ip\-ratelimit\-factor: \fI<number>
+Set the amount of queries to rate limit when the limit is exceeded.
+If set to 0, all queries are dropped for addresses where the limit is
+exceeded.  If set to another value, 1 in that number is allowed through
+to complete.  Default is 10, allowing 1/10 traffic to flow normally.
+This can make ordinary queries complete (if repeatedly queried for),
+and enter the cache, whilst also mitigating the traffic flow by the
+factor given.
 .SS "Remote Control Options"
 In the
 .B remote\-control:
diff --git a/services/cache/infra.c b/services/cache/infra.c
index c0049d8b6..6050f0075 100644
--- a/services/cache/infra.c
+++ b/services/cache/infra.c
@@ -61,6 +61,10 @@
 /** ratelimit value for delegation point */
 int infra_dp_ratelimit = 0;
 
+/** ratelimit value for client ip addresses,
+ *  in queries per second. */
+int infra_ip_ratelimit = 0;
+
 size_t 
 infra_sizefunc(void* k, void* ATTR_UNUSED(d))
 {
@@ -244,6 +248,14 @@ infra_create(struct config_file* cfg)
 		}
 		name_tree_init_parents(&infra->domain_limits);
 	}
+	infra_ip_ratelimit = cfg->ip_ratelimit;
+	infra->client_ip_rates = slabhash_create(cfg->ratelimit_slabs,
+	    INFRA_HOST_STARTSIZE, cfg->ip_ratelimit_size, &ip_rate_sizefunc,
+	    &ip_rate_compfunc, &ip_rate_delkeyfunc, &ip_rate_deldatafunc, NULL);
+	if(!infra->client_ip_rates) {
+		infra_delete(infra);
+		return NULL;
+	}
 	return infra;
 }
 
@@ -264,6 +276,7 @@ infra_delete(struct infra_cache* infra)
 	slabhash_delete(infra->hosts);
 	slabhash_delete(infra->domain_rates);
 	traverse_postorder(&infra->domain_limits, domain_limit_free, NULL);
+	slabhash_delete(infra->client_ip_rates);
 	free(infra);
 }
 
@@ -284,21 +297,28 @@ infra_adjust(struct infra_cache* infra, struct config_file* cfg)
 	return infra;
 }
 
-/** calculate the hash value for a host key */
+/** calculate the hash value for a host key
+ *  set use_port to a non-0 number to use the port in
+ *  the hash calculation; 0 to ignore the port.*/
 static hashvalue_t
-hash_addr(struct sockaddr_storage* addr, socklen_t addrlen)
+hash_addr(struct sockaddr_storage* addr, socklen_t addrlen,
+  int use_port)
 {
 	hashvalue_t h = 0xab;
 	/* select the pieces to hash, some OS have changing data inside */
 	if(addr_is_ip6(addr, addrlen)) {
 		struct sockaddr_in6* in6 = (struct sockaddr_in6*)addr;
 		h = hashlittle(&in6->sin6_family, sizeof(in6->sin6_family), h);
-		h = hashlittle(&in6->sin6_port, sizeof(in6->sin6_port), h);
+		if(use_port){
+			h = hashlittle(&in6->sin6_port, sizeof(in6->sin6_port), h);
+		}
 		h = hashlittle(&in6->sin6_addr, INET6_SIZE, h);
 	} else {
 		struct sockaddr_in* in = (struct sockaddr_in*)addr;
 		h = hashlittle(&in->sin_family, sizeof(in->sin_family), h);
-		h = hashlittle(&in->sin_port, sizeof(in->sin_port), h);
+		if(use_port){
+			h = hashlittle(&in->sin_port, sizeof(in->sin_port), h);
+		}
 		h = hashlittle(&in->sin_addr, INET_SIZE, h);
 	}
 	return h;
@@ -308,7 +328,7 @@ hash_addr(struct sockaddr_storage* addr, socklen_t addrlen)
 static hashvalue_t
 hash_infra(struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* name)
 {
-	return dname_query_hash(name, hash_addr(addr, addrlen));
+	return dname_query_hash(name, hash_addr(addr, addrlen, 1));
 }
 
 /** lookup version that does not check host ttl (you check it) */
@@ -726,6 +746,30 @@ int infra_find_ratelimit(struct infra_cache* infra, uint8_t* name,
 	return infra_dp_ratelimit;
 }
 
+size_t ip_rate_sizefunc(void* k, void* ATTR_UNUSED(d))
+{
+	struct ip_rate_key* key = (struct ip_rate_key*)k;
+	return sizeof(*key) + sizeof(struct ip_rate_data)
+		+ lock_get_mem(&key->entry.lock);
+}
+
+int ip_rate_compfunc(void* key1, void* key2)
+{
+	struct ip_rate_key* k1 = (struct ip_rate_key*)key1;
+	struct ip_rate_key* k2 = (struct ip_rate_key*)key2;
+	return sockaddr_cmp_addr(&k1->addr, k1->addrlen,
+		&k2->addr, k2->addrlen);
+}
+
+void ip_rate_delkeyfunc(void* k, void* ATTR_UNUSED(arg))
+{
+	struct ip_rate_key* key = (struct ip_rate_key*)k;
+	if(!key)
+		return;
+	lock_rw_destroy(&key->entry.lock);
+	free(key);
+}
+
 /** find data item in array, for write access, caller unlocks */
 static struct lruhash_entry* infra_find_ratedata(struct infra_cache* infra,
 	uint8_t* name, size_t namelen, int wr)
@@ -739,6 +783,20 @@ static struct lruhash_entry* infra_find_ratedata(struct infra_cache* infra,
 	return slabhash_lookup(infra->domain_rates, h, &key, wr);
 }
 
+/** find data item in array for ip addresses */
+struct lruhash_entry* infra_find_ip_ratedata(struct infra_cache* infra,
+	struct comm_reply* repinfo, int wr)
+{
+	struct ip_rate_key key;
+	hashvalue_t h = hash_addr(&(repinfo->addr),
+		repinfo->addrlen, 0);
+	memset(&key, 0, sizeof(key));
+	key.addr = repinfo->addr;
+	key.addrlen = repinfo->addrlen;
+	key.entry.hash = h;
+	return slabhash_lookup(infra->client_ip_rates, h, &key, wr);
+}
+
 /** create rate data item for name, number 1 in now */
 static void infra_create_ratedata(struct infra_cache* infra,
 	uint8_t* name, size_t namelen, time_t timenow)
@@ -767,6 +825,30 @@ static void infra_create_ratedata(struct infra_cache* infra,
 	slabhash_insert(infra->domain_rates, h, &k->entry, d, NULL);
 }
 
+/** create rate data item for ip address */
+static void infra_ip_create_ratedata(struct infra_cache* infra,
+	struct comm_reply* repinfo, time_t timenow)
+{
+	hashvalue_t h = hash_addr(&(repinfo->addr),
+	repinfo->addrlen, 0);
+	struct ip_rate_key* k = (struct ip_rate_key*)calloc(1, sizeof(*k));
+	struct ip_rate_data* d = (struct ip_rate_data*)calloc(1, sizeof(*d));
+	if(!k || !d) {
+		free(k);
+		free(d);
+		return; /* alloc failure */
+	}
+	k->addr = repinfo->addr;
+	k->addrlen = repinfo->addrlen;
+	lock_rw_init(&k->entry.lock);
+	k->entry.hash = h;
+	k->entry.key = k;
+	k->entry.data = d;
+	d->qps[0] = 1;
+	d->timestamp[0] = timenow;
+	slabhash_insert(infra->client_ip_rates, h, &k->entry, d, NULL);
+}
+
 /** find the second and return its rate counter, if none, remove oldest */
 static int* infra_rate_find_second(void* data, time_t t)
 {
@@ -875,6 +957,41 @@ infra_get_mem(struct infra_cache* infra)
 {
 	size_t s = sizeof(*infra) + slabhash_get_mem(infra->hosts);
 	if(infra->domain_rates) s += slabhash_get_mem(infra->domain_rates);
+	if(infra->client_ip_rates) s += slabhash_get_mem(infra->client_ip_rates);
 	/* ignore domain_limits because walk through tree is big */
 	return s;
 }
+
+int infra_ip_ratelimit_inc(struct infra_cache* infra,
+  struct comm_reply* repinfo, time_t timenow)
+{
+	int max;
+	struct lruhash_entry* entry;
+
+	/* not enabled */
+	if(!infra_ip_ratelimit) {
+		return 1;
+	}
+	/* find or insert ratedata */
+	entry = infra_find_ip_ratedata(infra, repinfo, 1);
+	if(entry) {
+		int premax = infra_rate_max(entry->data, timenow);
+		int* cur = infra_rate_find_second(entry->data, timenow);
+		(*cur)++;
+		max = infra_rate_max(entry->data, timenow);
+		lock_rw_unlock(&entry->lock);
+
+		if(premax < infra_ip_ratelimit && max >= infra_ip_ratelimit) {
+			char client_ip[128];
+			addr_to_str((struct sockaddr_storage *)&repinfo->addr,
+				repinfo->addrlen, client_ip, sizeof(client_ip));
+			verbose(VERB_OPS, "ratelimit exceeded %s %d", client_ip,
+				infra_ip_ratelimit);
+		}
+		return (max <= infra_ip_ratelimit);
+	}
+
+	/* create */
+	infra_ip_create_ratedata(infra, repinfo, timenow);
+	return 1;
+}
diff --git a/services/cache/infra.h b/services/cache/infra.h
index fc7abb7c4..213029cd5 100644
--- a/services/cache/infra.h
+++ b/services/cache/infra.h
@@ -36,7 +36,10 @@
 /**
  * \file
  *
- * This file contains the infrastructure cache.
+ * This file contains the infrastructure cache, as well as rate limiting.
+ * Note that there are two sorts of rate-limiting here:
+ *  - Pre-cache, per-query rate limiting (query ratelimits)
+ *  - Post-cache, per-domain name rate limiting (infra-ratelimits)
  */
 
 #ifndef SERVICES_CACHE_INFRA_H
@@ -44,6 +47,8 @@
 #include "util/storage/lruhash.h"
 #include "util/storage/dnstree.h"
 #include "util/rtt.h"
+#include "util/netevent.h"
+#include "util/data/msgreply.h"
 struct slabhash;
 struct config_file;
 
@@ -113,6 +118,8 @@ struct infra_cache {
 	struct slabhash* domain_rates;
 	/** ratelimit settings for domains, struct domain_limit_data */
 	rbtree_t domain_limits;
+	/** hash table with query rates per client ip: ip_rate_key, ip_rate_data */
+	struct slabhash* client_ip_rates;
 };
 
 /** ratelimit, unless overridden by domain_limits, 0 is off */
@@ -142,6 +149,21 @@ struct rate_key {
 	size_t namelen;
 };
 
+/** ip ratelimit, 0 is off */
+extern int infra_ip_ratelimit;
+
+/**
+ * key for ip_ratelimit lookups, a source IP.
+ */
+struct ip_rate_key {
+	/** lruhash key entry */
+	struct lruhash_entry entry;
+	/** client ip information */
+	struct sockaddr_storage addr;
+	/** length of address */
+	socklen_t addrlen;
+};
+
 /** number of seconds to track qps rate */
 #define RATE_WINDOW 2
 
@@ -160,6 +182,8 @@ struct rate_data {
 	time_t timestamp[RATE_WINDOW];
 };
 
+#define ip_rate_data rate_data
+
 /** infra host cache default hash lookup size */
 #define INFRA_HOST_STARTSIZE 32
 /** bytes per zonename reserved in the hostcache, dnamelen(zonename.com.) */
@@ -381,6 +405,16 @@ int infra_rate_max(void* data, time_t now);
 int infra_find_ratelimit(struct infra_cache* infra, uint8_t* name,
 	size_t namelen);
 
+/** Update query ratelimit hash and decide
+ *  whether or not a query should be dropped.
+ *  @param infra: infra cache
+ *  @param repinfo: information about client
+ *  @param timenow: what time it is now.
+ *  @return 1 if it could be incremented. 0 if the increment overshot the
+ *  ratelimit and the query should be dropped. */
+int infra_ip_ratelimit_inc(struct infra_cache* infra,
+	struct comm_reply* repinfo, time_t timenow);
+
 /**
  * Get memory used by the infra cache.
  * @param infra: infrastructure cache.
@@ -413,4 +447,16 @@ void rate_delkeyfunc(void* k, void* arg);
 /** delete data */
 void rate_deldatafunc(void* d, void* arg);
 
+/* calculate size for the client ip hashtable */
+size_t ip_rate_sizefunc(void* k, void* d);
+
+/* compare two addresses */
+int ip_rate_compfunc(void* key1, void* key2);
+
+/* delete key, and destroy the lock */
+void ip_rate_delkeyfunc(void* d, void* arg);
+
+/* delete data */
+#define ip_rate_deldatafunc rate_deldatafunc
+
 #endif /* SERVICES_CACHE_INFRA_H */
diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index 866674d2e..470b796e5 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -124,6 +124,7 @@ usage(void)
 	printf("				or off to turn off root forwarding\n");
 	printf("				or give list of ip addresses\n");
 	printf("  ratelimit_list [+a]		list ratelimited domains\n");
+	printf("  ip_ratelimit_list [+a]	list ratelimited ip addresses\n");
 	printf("		+a		list all, also not ratelimited\n");
 	printf("Version %s\n", PACKAGE_VERSION);
 	printf("BSD licensed, see LICENSE in source package for details.\n");
diff --git a/util/config_file.c b/util/config_file.c
index 19b360c53..1eba4af86 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -245,11 +245,15 @@ config_create(void)
 		goto error_exit;
 #endif
 	cfg->disable_dnssec_lame_check = 0;
+	cfg->ip_ratelimit = 0;
 	cfg->ratelimit = 0;
+	cfg->ip_ratelimit_slabs = 4;
 	cfg->ratelimit_slabs = 4;
+	cfg->ip_ratelimit_size = 4*1024*1024;
 	cfg->ratelimit_size = 4*1024*1024;
 	cfg->ratelimit_for_domain = NULL;
 	cfg->ratelimit_below_domain = NULL;
+	cfg->ip_ratelimit_factor = 10;
 	cfg->ratelimit_factor = 10;
 	cfg->qname_minimisation = 0;
 	cfg->qname_minimisation_strict = 0;
@@ -488,12 +492,19 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else S_STR("module-config:", module_conf)
 	else S_STR("python-script:", python_script)
 	else S_YNO("disable-dnssec-lame-check:", disable_dnssec_lame_check)
+	else if(strcmp(opt, "ip-ratelimit:") == 0) {
+	    IS_NUMBER_OR_ZERO; cfg->ip_ratelimit = atoi(val);
+	    infra_ip_ratelimit=cfg->ip_ratelimit;
+	}
 	else if(strcmp(opt, "ratelimit:") == 0) {
 	    IS_NUMBER_OR_ZERO; cfg->ratelimit = atoi(val);
 	    infra_dp_ratelimit=cfg->ratelimit;
 	}
+	else S_MEMSIZE("ip-ratelimit-size:", ip_ratelimit_size)
 	else S_MEMSIZE("ratelimit-size:", ratelimit_size)
+	else S_POW2("ip-ratelimit-slabs:", ip_ratelimit_slabs)
 	else S_POW2("ratelimit-slabs:", ratelimit_slabs)
+	else S_NUMBER_OR_ZERO("ip-ratelimit-factor:", ip_ratelimit_factor)
 	else S_NUMBER_OR_ZERO("ratelimit-factor:", ratelimit_factor)
 	else S_YNO("qname-minimisation:", qname_minimisation)
 	else S_YNO("qname-minimisation-strict:", qname_minimisation_strict)
@@ -798,11 +809,15 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_DEC(opt, "max-udp-size", max_udp_size)
 	else O_STR(opt, "python-script", python_script)
 	else O_YNO(opt, "disable-dnssec-lame-check", disable_dnssec_lame_check)
+	else O_DEC(opt, "ip-ratelimit", ip_ratelimit)
 	else O_DEC(opt, "ratelimit", ratelimit)
+	else O_MEM(opt, "ip-ratelimit-size", ip_ratelimit_size)
 	else O_MEM(opt, "ratelimit-size", ratelimit_size)
+	else O_DEC(opt, "ip-ratelimit-slabs", ip_ratelimit_slabs)
 	else O_DEC(opt, "ratelimit-slabs", ratelimit_slabs)
 	else O_LS2(opt, "ratelimit-for-domain", ratelimit_for_domain)
 	else O_LS2(opt, "ratelimit-below-domain", ratelimit_below_domain)
+	else O_DEC(opt, "ip-ratelimit-factor", ip_ratelimit_factor)
 	else O_DEC(opt, "ratelimit-factor", ratelimit_factor)
 	else O_DEC(opt, "val-sig-skew-min", val_sig_skew_min)
 	else O_DEC(opt, "val-sig-skew-max", val_sig_skew_max)
diff --git a/util/config_file.h b/util/config_file.h
index a141eb598..d52c2f481 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -396,7 +396,16 @@ struct config_file {
 	/** true to disable DNSSEC lameness check in iterator */
 	int disable_dnssec_lame_check;
 
-	/** ratelimit 0 is off, otherwise qps (unless overridden) */
+	/** ratelimit for ip addresses. 0 is off, otherwise qps (unless overridden) */
+	int ip_ratelimit;
+	/** number of slabs for ip_ratelimit cache */
+	size_t ip_ratelimit_slabs;
+	/** memory size in bytes for ip_ratelimit cache */
+	size_t ip_ratelimit_size;
+	/** ip_ratelimit factor, 0 blocks all, 10 allows 1/10 of traffic */
+	int ip_ratelimit_factor;
+
+	/** ratelimit for domains. 0 is off, otherwise qps (unless overridden) */
 	int ratelimit;
 	/** number of slabs for ratelimit cache */
 	size_t ratelimit_slabs;
diff --git a/util/configlexer.c b/util/configlexer.c
index 52fd30206..914b0de47 100644
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -378,8 +378,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 199
-#define YY_END_OF_BUFFER 200
+#define YY_NUM_RULES 203
+#define YY_END_OF_BUFFER 204
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -387,224 +387,228 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[1969] =
+static yyconst flex_int16_t yy_accept[1997] =
     {   0,
-        1,    1,  181,  181,  185,  185,  189,  189,  193,  193,
-        1,    1,  200,  197,    1,  179,  179,  198,    2,  198,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      181,  182,  182,  183,  198,  185,  186,  186,  187,  198,
-      192,  189,  190,  190,  191,  198,  193,  194,  194,  195,
-      198,  196,  180,    2,  184,  198,  196,  197,    0,    1,
-        2,    2,    2,    2,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+        1,    1,  185,  185,  189,  189,  193,  193,  197,  197,
+        1,    1,  204,  201,    1,  183,  183,  202,    2,  202,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      185,  186,  186,  187,  202,  189,  190,  190,  191,  202,
+      196,  193,  194,  194,  195,  202,  197,  198,  198,  199,
+      202,  200,  184,    2,  188,  202,  200,  201,    0,    1,
+        2,    2,    2,    2,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
 
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  181,    0,
-      185,    0,  192,    0,  189,  193,    0,  196,    0,    2,
-        2,  196,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  185,    0,
+      189,    0,  196,    0,  193,  197,    0,  200,    0,    2,
+        2,  200,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
 
-      197,  197,  197,  197,  197,  197,  197,  197,  196,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  196,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      201,  201,  201,  201,  201,  201,  201,  201,  200,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  200,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
 
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-       77,  197,  197,  197,  197,  197,  197,    8,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,   88,  196,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,   77,  201,  201,  201,  201,  201,  201,    8,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,   88,  200,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
 
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  196,
-      197,  197,  197,  197,  197,   37,  197,  197,  197,  197,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  200,  201,  201,  201,  201,  201,   37,  201,
 
-      197,  197,  197,  197,  197,  197,  159,  197,   14,   15,
-      197,   18,   17,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  145,  197,
-      197,  197,  197,  197,  197,  197,  197,    3,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  159,
+      201,   14,   15,  201,   18,   17,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  145,  201,  201,  201,  201,  201,  201,  201,
+      201,    3,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
 
-      197,  196,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      188,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,   40,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-       41,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,   20,  197,
+      201,  201,  201,  201,  201,  200,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  192,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,   40,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,   41,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
 
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,   96,  197,  188,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      112,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,   95,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,   75,  197,  197,
+      201,  201,  201,   20,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,   96,  201,  192,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  112,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+       95,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
 
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,   25,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,   38,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,   39,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,   28,  197,  197,  197,  197,  197,
+      201,  201,  201,   75,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,   25,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,   38,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,   39,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
 
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  173,  197,
-      197,  197,  197,  197,  197,  197,   32,  197,   33,  197,
-      197,  197,   78,  197,   79,  197,  197,   76,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,    7,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  152,
-      197,  197,  197,  197,   98,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+       28,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  174,  201,  201,  201,  201,
+      201,  201,  201,   32,  201,   33,  201,  201,  201,   78,
+      201,   79,  201,  201,   76,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,    7,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  152,  201,  201,  201,
+      201,   98,  201,  201,  201,  201,  201,  201,  201,  201,
 
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,   29,
-      197,  197,  197,  197,  197,  197,  128,  197,  127,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,   16,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,   42,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,   81,   80,  197,
-      197,  197,  197,  197,  197,  197,  197,  122,  197,  197,
-      197,  197,  197,  197,  197,  197,   89,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,   29,  201,  201,  201,
+      201,  201,  201,  201,  128,  201,  127,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,   16,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,   42,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,   81,   80,  201,  201,  201,
+      201,  201,  201,  201,  201,  122,  201,  201,  201,  201,
+      201,  201,  201,  201,   89,  201,  201,  201,  201,  201,
 
-      197,   60,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,   64,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-       36,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      125,  126,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,    6,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,   26,  197,  197,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,   60,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,   64,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,   36,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  125,
+      126,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+        6,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
 
-      197,  197,  197,  197,  197,  197,  118,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  138,  197,  119,  197,
-      197,  150,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,   27,  197,  197,  197,  197,   84,  197,   85,
-      197,   83,  197,  197,  197,  197,  197,  197,  197,   94,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  120,  197,  197,  197,  197,  197,  123,  197,
-      149,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,   74,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      201,  201,  201,  201,  201,  201,   26,  201,  201,  201,
+      201,  201,  201,  201,  201,  118,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  138,  201,  119,  201,  201,
+      150,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,   27,  201,  201,  201,  201,   84,  201,   85,  201,
+       83,  201,  201,  201,  201,  201,  201,  201,   94,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      173,  201,  201,  120,  201,  201,  201,  201,  201,  123,
+      201,  149,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,   74,  201,  201,  201,  201,
 
-       34,  197,  197,   22,  197,  197,  197,  197,   19,  197,
-      103,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,   49,   51,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  160,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-       86,  197,  197,  197,  197,  197,  197,  197,   93,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,   97,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  144,  197,  197,  197,  197,  197,  197,  197,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,   34,  201,  201,   22,  201,  201,  201,  201,   19,
+      201,  103,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,   49,   51,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  160,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,   86,  201,  201,  201,  201,  201,  201,  201,   93,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,   97,  201,  201,  201,  201,  201,  201,  201,  201,
 
-      197,  197,  197,  111,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  107,  197,  113,
-      197,  197,  197,  197,  197,   92,  197,  197,   70,  197,
-      136,  197,  197,  197,  197,  197,  151,  197,  197,  197,
-      197,  197,  197,  197,  165,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  110,  197,  197,
-      197,  197,  197,   52,   53,  197,  197,   35,   59,  114,
-      197,  129,  197,  153,  124,  197,  197,   45,  197,  116,
-      197,  197,  197,  197,  197,    9,  197,  197,  197,   73,
-      197,  197,  197,  197,  175,  197,  135,  197,  197,  197,
+      201,  201,  201,  201,  201,  144,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  111,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      107,  201,  113,  201,  201,  201,  201,  201,   92,  201,
+      201,   70,  201,  136,  201,  201,  201,  201,  201,  151,
+      201,  201,  201,  201,  201,  201,  201,  165,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      110,  201,  201,  201,  201,  201,   52,   53,  201,  201,
+      201,  201,  201,   35,   59,  114,  201,  129,  201,  153,
+      124,  201,  201,   45,  201,  116,  201,  201,  201,  201,
 
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,   99,  164,
-      197,  197,  197,  197,  197,  197,  197,  197,  146,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  115,  197,  197,   44,   46,
-      197,  197,  197,  197,  197,  197,  197,   72,  197,  197,
-      197,  197,  174,  197,  197,  197,  197,  140,   23,   24,
-      197,  197,  197,  197,  197,  197,  197,  197,   69,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      201,    9,  201,  201,  201,   73,  201,  201,  201,  201,
+      178,  201,  135,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,   99,  164,  201,  201,  201,  201,
+      201,  201,  201,  201,  146,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  115,  201,  201,   44,   46,  201,
+      201,  201,  201,  201,  201,  201,   72,  201,  201,  201,
+      201,  176,  201,  201,  201,  201,  140,   23,   24,  201,
 
-      197,  142,  139,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,   43,  197,  197,  197,  197,  197,  197,  197,
-      197,   13,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,   12,  197,  197,   21,  197,  197,  197,  178,
-      197,   47,  197,  148,  141,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  106,  105,  197,
-      197,  197,  197,  143,  137,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,   54,  197,  197,  197,  147,
-      197,  197,  197,  197,  197,  197,  197,  197,   48,  197,
+      201,  201,  201,  201,  201,  201,  201,   69,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      142,  139,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,   43,  201,  201,  201,  201,  201,  201,  201,  201,
+       13,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,   12,  201,  201,   21,  201,  201,
+      201,  182,  201,   47,  201,  148,  141,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  106,
+      105,  201,  201,  201,  201,  143,  137,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
 
-      197,   82,  197,  100,  102,  130,  197,  197,  197,  104,
-      197,  197,  154,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  161,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  131,  197,  197,
-      197,   30,  197,  197,  197,  197,    4,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  157,  197,
-      197,  197,  197,  197,  197,  197,  197,  163,  197,  197,
-      134,  197,  197,  197,  197,  197,  197,  197,  197,   57,
-      197,   31,  158,  197,   11,  197,  197,  197,  197,  197,
-      197,  132,   61,  197,  197,  197,  109,  197,  197,  197,
+      201,  201,  201,  201,  201,  201,  201,   54,  201,  201,
+      201,  177,  201,  201,  147,  201,  201,  201,  201,  201,
+      201,  201,  201,   48,  201,  201,   82,  201,  100,  102,
+      130,  201,  201,  201,  104,  201,  201,  154,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  161,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  131,  201,  201,  175,  201,  201,   30,  201,
+      201,  201,  201,    4,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  157,  201,  201,  201,  201,
+      201,  201,  201,  201,  163,  201,  201,  134,  201,  201,
 
-      197,  197,  197,  197,  197,  197,  197,  162,   90,  197,
-       87,  197,  197,  197,   63,   67,   62,  197,   55,  197,
-       10,  197,  197,  197,  176,  197,  197,  108,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,   68,   66,  197,   56,  197,  121,  197,  197,  133,
-      197,  197,  197,  197,  101,   50,  197,  197,  197,  197,
-      197,  197,  197,   91,   65,   58,  197,  177,  197,  197,
-      197,  156,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,   71,  197,  155,  172,  197,  197,  197,  197,  197,
+      201,  201,  201,  201,  201,  201,   57,  201,   31,  181,
+      158,  201,   11,  201,  201,  201,  201,  201,  201,  132,
+       61,  201,  201,  201,  109,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  162,   90,  201,   87,  201,
+      201,  201,   63,   67,   62,  201,   55,  201,   10,  201,
+      201,  201,  179,  201,  201,  108,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,   68,
+       66,  201,   56,  201,  121,  201,  201,  133,  201,  201,
+      201,  201,  101,   50,  201,  201,  201,  201,  201,  201,
+      201,   91,   65,   58,  201,  180,  201,  201,  201,  156,
+
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,   71,
+      201,  155,  172,  201,  201,  201,  201,  201,  201,    5,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  117,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      168,  201,  201,  201,  201,  201,  201,  201,  201,  201,
+      201,  201,  201,  201,  166,  201,  169,  170,  201,  201,
+      201,  201,  201,  167,  171,    0
 
-      197,    5,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  117,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  168,  197,  197,  197,  197,  197,  197,  197,
-      197,  197,  197,  197,  197,  197,  166,  197,  169,  170,
-      197,  197,  197,  197,  197,  167,  171,    0
     } ;
 
 static yyconst YY_CHAR yy_ec[256] =
@@ -647,23 +651,23 @@ static yyconst YY_CHAR yy_meta[40] =
         1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_uint16_t yy_base[1983] =
+static yyconst flex_uint16_t yy_base[2011] =
     {   0,
         0,    0,   37,   40,   44,   51,   63,   75,   56,   68,
-       87,  108, 2641, 2517,   50, 3886, 3886, 3886,  129,   94,
+       87,  108, 2518, 2290,   50, 3939, 3939, 3939,  129,   94,
        70,  104,  130,   90,  109,  106,  127,  111,   84,  122,
       146,  148,   50,  170,  136,  158,  152,  180,  168,  191,
-     2475, 3886, 3886, 3886,   70, 1858, 3886, 3886, 3886,   42,
-     1703, 1444, 3886, 3886, 3886,  210, 1332, 3886, 3886, 3886,
-      141, 1259, 3886,  214, 3886,  218,  140, 1188,  224,  167,
+     2135, 3939, 3939, 3939,   70, 1956, 3939, 3939, 3939,   42,
+     1771, 1568, 3939, 3939, 3939,  210, 1370, 3939, 3939, 3939,
+      141, 1190, 3939,  214, 3939,  218,  140, 1132,  224,  167,
         0,  235,    0,    0,   92,  162,  164,  174,  193,  217,
       230,  219,  103,  178,  233,  225,  220,  221,  241,  243,
       244,  189,  249,  247,  256,  245,  252,  255,  254,  260,
 
       265,  268,  138,  272,  270,  271,  276,  280,  281,  287,
       273,  285,  282,  288,  289,  290,  295,  303,  300,  305,
-      297,  307,  308,  314,  317,  318,  310,  319, 1145,  329,
-      665,  122,  458,  342,  373,  327,  347,  222,  351,  355,
+      297,  307,  308,  314,  317,  318,  310,  319,  596,  329,
+      458,  122,  403,  342,  373,  327,  347,  222,  351,  355,
         0,  332,  348,  356,  350,  352,  354,  357,  341,  358,
       368,  359,  370,  379,  377,  398,  380,  366,  378,  382,
        49,  384,  386,  311,  389,  393,  376,  390,  396,  409,
@@ -675,423 +679,429 @@ static yyconst flex_uint16_t yy_base[1983] =
       493,  500,  498,  504,  502,  505,  507,  510,  488,  509,
       514,  519,  525,  526,  528,  515,  524,  530,  532,  534,
       540,  537,  546,  544,  542,  553,  538,  549,  550,  552,
-      554,  556,  557,  560,  561,  562,  566,  568,  569,  570,
-      574,  576,  577,  573,  581,  587,  596,  597,  584,  588,
-      599,  602,  606,  607,  609,  613,  614,  615,  616,  622,
-      618,  620,  621,  623,  629,  630,  640,  641,  631,  633,
-      632,  642,  651,  643,  671,  634,  655,  663,  659,  660,
-      661,  668,  672,  666,  675,  669,  677,  678,  696,  681,
+      554,  556,  557,  560,  561,  562,  566,  568,  574,  570,
+      576,  572,  577,  578,  582,  585,  591,  601,  602,  587,
+      583,  603,  606,  609,  611,  613,  610,  617,  618,  619,
+      626,  620,  623,  624,  631,  632,  633,  641,  638,  634,
+      637,  635,  644,  646,  652,  667,  656,  654,  673,  659,
+      674,  660,  664,  690,  676,  677,  687,  689,  688,  696,
 
-      692,  694,  702,  698,  700,  709,  699,  710,  711,  703,
-      713,  712,  718,  720,  721,  723,  724,  725,  736,  728,
-      734,  731,  741,  739,  744,  750,  748,  742,  756,  759,
-      758,  746,  760,  761,  763,  764,  771,  769,  766,  776,
-     3886,  778,  773,  780,  781,  782,  783, 3886,  785,  784,
-      786,  796,  789,  792,  793,  811,  812,  799,  808,  809,
-      810,  814,  815,  816,  836,  818,  820,  817,  827,  823,
-      828,  840,  824,  845,  843,  847,  850,  834,  851,  856,
-      854,  857,  860,  864, 3886,  867,  874,  866,  868,  872,
-      879,  881,  877,  888,  882,  890,  884,  891,  892,  897,
+      678,  692,  695,  705,  701,  706,  710,  712,  713,  714,
+      719,  716,  720,  721,  722,  723,  726,  727,  734,  738,
+      741,  749,  731,  745,  743,  753,  746,  661,  754,  715,
+      755,  762,  760,  761,  763,  765,  767,  769,  770,  772,
+      775,  780, 3939,  783,  776,  778,  785,  787,  788, 3939,
+      790,  789,  791,  798,  792,  799,  795,  811,  817,  802,
+      813,  814,  815,  816,  820,  819,  839,  822,  825,  827,
+      828,  826,  831,  848,  832,  852,  841,  850,  846,  854,
+      837,  863,  860,  864,  866,  870, 3939,  867,  877,  874,
+      875,  878,  879,  885,  880,  894,  888,  895,  882,  896,
 
-      903,  901,  905,  907,  915,  909,  912,  922,  900,  918,
-      919,  920,  930,  927,  928,  926,  934,  932,  935,  936,
-      940,  941,  943,  945,  951,  952,  953,  954,  955,  963,
-      964,  956,  960,  966,  967,  970,  979,  978,  977,  985,
-      986,  975,  976,  992,  989, 1000,  996,  997, 1006,  998,
-     1003, 1009, 1008, 1007, 1013, 1020, 1012, 1021, 1022, 1023,
-     1026, 1027, 1028, 1029, 1030, 1032, 1031, 1034, 1035, 1042,
-     1036, 1038, 1051, 1054, 1045, 1059, 1060, 1043, 1061, 1063,
-     1066, 1065, 1068, 1075, 1067, 1077, 1069, 1079, 1081, 1082,
-     1083, 1088, 1089, 1094, 1091, 3886, 1101, 1097, 1098, 1099,
+      899,  890,  908,  904,  911,  913,  919,  916,  921,  923,
+      905,  922,  924,  925,  933,  930,  931,  932,  940,  937,
+      939,  938,  944,  947,  945,  949,  951,  955,  964,  957,
+      958,  967,  960,  968,  970,  972,  974,  975,  976,  982,
+      978,  980,  987,  989,  981,  992, 1000,  996, 1002, 1004,
+      998, 1010, 1008, 1011, 1017, 1013, 1015, 1014, 1028, 1029,
+     1016, 1030, 1020, 1025, 1026, 1034, 1036, 1037, 1041, 1039,
+     1042, 1044, 1052, 1048, 1049, 1050, 1058, 1053, 1055, 1063,
+     1065, 1069, 1066, 1070, 1071, 1072, 1076, 1074, 1080, 1085,
+     1083, 1086, 1088, 1096, 1098, 1089, 1100, 1103, 3939, 1111,
 
-     1104, 1112, 1105, 1106, 1108, 1134, 3886, 1114, 3886, 3886,
-     1109, 3886, 3886, 1116, 1115, 1119, 1127, 1135, 1157, 1131,
-     1120, 1137, 1141, 1148, 1142, 1150, 1140, 1165, 1163, 1167,
-     1172, 1152, 1160, 1171, 1173, 1174, 1180, 1178, 1118, 1183,
-     1184, 1185, 1187, 1194, 1200, 1199, 1197, 1198, 1204, 1205,
-     1208, 1207, 1209, 1211, 1215, 1217, 1221, 1218, 3886, 1220,
-     1222, 1227, 1219, 1234, 1226,  403, 1236, 3886, 1232, 1238,
-     1240, 1242, 1244, 1245, 1246, 1248, 1249, 1250, 1251, 1256,
-     1257, 1258, 1273, 1254, 1263, 1275, 1281, 1278, 1279, 1280,
-     1283, 1284, 1285, 1294, 1287, 1291, 1293, 1301, 1295, 1303,
+     1104, 1113, 1107, 1090, 1120, 1114, 1105, 1091, 1125, 3939,
+     1118, 3939, 3939, 1121, 3939, 3939, 1126, 1136, 1127, 1128,
+     1145, 1148, 1141, 1139, 1143, 1151, 1159, 1156, 1161, 1164,
+     1169, 1171, 1172, 1173, 1180, 1153, 1174, 1177, 1181, 1183,
+     1184, 1186, 1188, 1187, 1192, 1189, 1196, 1203, 1211, 1207,
+     1208, 1209, 1212, 1213, 1216, 1215, 1199, 1224, 1219, 1225,
+     1232, 1226, 3939, 1229, 1230, 1234, 1235, 1240, 1236, 1242,
+     1243, 3939, 1244, 1247, 1248, 1250, 1253, 1256, 1255, 1257,
+     1259, 1260, 1258, 1262, 1268, 1272, 1281, 1263, 1271, 1289,
+     1291, 1288, 1287, 1290, 1293, 1273, 1295, 1304, 1297, 1301,
 
-     1299, 1308, 1297, 1310, 1304, 1311, 1313, 1316, 1337, 1318,
-     1320, 1326, 1322, 1321, 1328, 1329, 1330, 1331, 1350, 1349,
-     1351, 1333, 1355, 1339, 1357, 1359, 1367, 1373, 1374, 1376,
-     1363, 1370, 1377, 1378, 1381, 1383, 1385, 1387, 1395, 1392,
-     3886, 1402, 1398, 1390, 1403, 1410, 1407, 1404, 1352, 1408,
-     1411, 1413, 1414, 1415, 1417, 1418, 1421, 1425, 1427, 3886,
-     1426, 1428, 1429, 1436, 1437, 1443, 1440, 1450, 1452, 1453,
-     3886, 1439, 1459, 1456, 1461, 1462, 1463, 1465, 1467, 1468,
-     1469, 1470, 1472, 1473, 1475, 1479, 1482, 1485, 1489, 1474,
-     1491, 1493, 1496, 1497, 1499, 1505, 1501, 1502, 3886, 1503,
+     1303, 1312, 1305, 1309, 1311, 1314, 1315, 1317, 1318, 1320,
+     1322, 1323, 1345, 1326, 1324, 1331, 1332, 1334, 1340, 1342,
+     1335, 1339, 1358, 1352, 1359, 1360, 1363, 1351, 1368, 1369,
+     1376, 1379, 1383, 1373, 1381, 1380, 1387, 1392, 1390, 1333,
+     1396, 1388, 1398, 1400, 3939, 1406, 1405, 1403, 1411, 1417,
+     1413, 1414, 1416, 1419, 1415, 1420, 1421, 1427, 1423, 1430,
+     1426, 1436, 1438, 1439, 3939, 1435, 1437, 1441, 1448, 1452,
+     1458, 1442, 1449, 1464, 1460, 3939, 1461, 1467, 1468, 1471,
+     1465, 1470, 1476, 1475, 1478, 1480, 1482, 1483, 1484, 1486,
+     1487, 1493, 1497, 1485, 1500, 1502, 1504, 1506, 1507, 1508,
 
-     1510, 1508, 1504, 1514, 1523, 1520, 1522, 1525, 1526, 1528,
-     1529, 1534, 1531, 1537, 1532, 1533, 3886, 1536,  186, 1538,
-     1539, 1540, 1548, 1561, 1557, 1559, 1553, 1563, 1565, 1566,
-     1550, 1568, 1571, 1572, 1574, 1576, 1578, 1579, 1580, 1582,
-     1584, 1587, 1588, 1544, 1592, 1595, 1593, 1597, 1601, 1599,
-     3886, 1603, 1605, 1608, 1609, 1611, 1612, 1613, 1615, 1617,
-     1621, 1624, 1620, 1622, 1627, 3886, 1637, 1629, 1633, 1631,
-     1640, 1644, 1653, 1646, 1647, 1649, 1654, 1655, 1662, 1658,
-     1663, 1660, 1666, 1670, 1672, 1674, 1676, 1677, 1678, 1684,
-     1685, 1682, 1686, 1697, 1688, 1694, 1693, 3886, 1695, 1701,
+     1514, 1510, 1511, 3939, 1512, 1517, 1513, 1519, 1528, 1534,
+     1526, 1532, 1536, 1533, 1539, 1538, 1544, 1542, 1545, 1543,
+     1546, 3939, 1547,  186, 1549, 1555, 1548, 1556, 1564, 1567,
+     1569, 1561, 1565, 1573, 1576, 1558, 1580, 1581, 1582, 1584,
+     1585, 1586, 1588, 1589, 1592, 1590, 1598, 1597, 1600, 1602,
+     1606, 1607, 1608, 1613, 1610, 3939, 1617, 1614, 1616, 1619,
+     1622, 1625, 1624, 1626, 1628, 1630, 1633, 1635, 1634, 1642,
+     3939, 1646, 1643, 1644, 1640, 1653, 1647, 1666, 1655, 1656,
+     1662, 1663, 1667, 1668, 1676, 1672, 1678, 1679, 1681, 1682,
+     1684, 1689, 1690, 1691, 1692, 1699, 1701, 1697, 1700, 1711,
 
-     1700, 1698, 1710, 1708, 1702, 1712, 1714, 1723, 1719, 1724,
-     1726, 1727, 1730, 3886, 1731, 1733, 1735, 1740, 1736, 1744,
-     1741, 1745, 1748, 1750, 1752, 1751, 1753, 1760, 1755, 1762,
-     1764, 1763, 3886, 1772, 1774, 1775, 1782, 1778, 1765, 1779,
-     1786, 1781, 1783, 1788, 1794, 1792, 1793, 1795, 1791, 1796,
-     1798, 1799, 1802, 1800, 1815, 1804, 1816, 3886, 1810, 1831,
-     1808, 1825, 1832, 1822, 1828, 1835, 1837, 1819, 1840, 1841,
-     1842, 1843, 1844, 1845, 1850, 1846, 1851, 1853, 1854, 1855,
-     1852, 1857, 1872, 1873, 1856, 1875, 1876, 1877, 1860, 1880,
-     1887, 1893, 1889, 1894, 3886, 1897, 1898, 1886, 1900, 1892,
+     1706, 1714, 1708, 3939, 1709, 1703, 1715, 1717, 1735, 1722,
+     1721, 1716, 1723, 1732, 1728, 1738, 1743, 1739, 1745, 3939,
+     1747, 1748, 1749, 1752, 1755, 1757, 1759, 1758, 1761, 1762,
+     1765, 1766, 1767, 1776, 1769, 1778, 1773, 1781, 3939, 1788,
+     1790, 1786, 1797, 1789, 1793, 1795, 1800, 1796, 1801, 1802,
+     1808, 1804, 1807, 1805, 1810, 1813, 1809, 1811, 1815, 1826,
+     1820, 1822, 1830, 3939, 1823, 1839, 1832, 1840, 1844, 1837,
+     1852, 1849, 1843, 1850, 1855, 1856, 1857, 1858, 1859, 1860,
+     1865, 1861, 1863, 1868, 1870, 1871, 1872, 1873, 1877, 1887,
+     1888, 1889, 1890, 1893, 1894, 1895, 1901, 1902, 1866, 1903,
 
-     1899, 1908, 1914, 1901, 1910, 1911, 1912, 1915, 1916, 1917,
-     1924, 1920, 1925, 1926, 1927, 1922, 1928, 1932, 1933, 1937,
-     1938, 1943, 1948, 1951, 1952, 1954, 1956, 1958, 3886, 1959,
-     1962, 1966, 1968, 1957, 1967, 1978, 3886, 1970, 3886, 1976,
-     1982, 1985, 3886, 1990, 3886, 1992, 1984, 3886, 1993, 1994,
-     1986, 1974, 1997, 1998, 2002, 2005, 2006, 2007, 2008, 2012,
-     2013, 2014, 2016, 2015, 3886, 2022, 2019, 2025, 2028, 2026,
-     2023, 2030, 2032, 2033, 2036, 2040, 2047, 2044, 2051, 3886,
-     2048, 2055, 2049, 2052, 3886, 2056, 2059, 2057, 2061, 2067,
-     2071, 2072, 2065, 2078, 2063, 2076, 2087, 2089, 2075, 2084,
+     3939, 1908, 1909, 1910, 1911, 1912, 1914, 1916, 1923, 1925,
+     1921, 1926, 1927, 1930, 1931, 1932, 1933, 1942, 1934, 1936,
+     1940, 1943, 1938, 1944, 1948, 1960, 1947, 1954, 1968, 1964,
+     1970, 1958, 1972, 1973, 1976, 3939, 1977, 1980, 1983, 1985,
+     1975, 1984, 1992, 3939, 1990, 3939, 1991, 1998, 2005, 3939,
+     2002, 3939, 2007, 1994, 3939, 2009, 2013, 2003, 2011, 2015,
+     2016, 2017, 2020, 2022, 2023, 2024, 2027, 2028, 2030, 2031,
+     2033, 3939, 2041, 2035, 2037, 2044, 2042, 2046, 2048, 2052,
+     2054, 2055, 2058, 2064, 2056, 2065, 3939, 2067, 2070, 2071,
+     2072, 3939, 1669, 2079, 2073, 2062, 2083, 2092, 2088, 2075,
 
-     2086, 2096, 2092, 2099, 2095, 2100, 2102, 2104, 2098, 2107,
-     2108, 2110, 2111, 2112, 2119, 2113, 2115, 2117, 2120, 3886,
-     2122, 2129, 2130, 2132, 2137, 2126, 3886, 2136, 3886, 2138,
-     2144, 2148, 2150, 2152, 2154, 2155, 2140, 2160, 2158, 2166,
-     2174, 2162, 2165, 2168, 2171, 2175, 2176, 3886, 2177, 2179,
-     2180, 2183, 2184, 2187, 2189, 2194, 2195, 3886, 2201, 2198,
-     2200, 2212, 2208, 2209, 2215, 2211, 2217, 3886, 3886, 2218,
-     2219, 2221, 2222, 2223, 2230, 2228, 2231, 3886, 2233, 2235,
-     2239, 2236, 2245, 2246, 2238, 2248, 3886, 2252, 2254, 2256,
-     2257, 2260, 2261, 2258, 2268, 2262, 2265, 2269, 2279, 2281,
+     2091, 2077, 2094, 2100, 2098, 2103, 2104, 2105, 2111, 2107,
+     2113, 2109, 2110, 2117, 2114, 2118, 2120, 2122, 2124, 2127,
+     2128, 2131, 2129, 2130, 2133, 2134, 3939, 2144, 2137, 2146,
+     2145, 2152, 2153, 2148, 3939, 2154, 3939, 2156, 2167, 2171,
+     2158, 2163, 2172, 2173, 2175, 2177, 2176, 2183, 2180, 2184,
+     2187, 2190, 2191, 2193, 2195, 3939, 2192, 2196, 2197, 2199,
+     2201, 2206, 2212, 2216, 2202, 3939, 2223, 2203, 2219, 2231,
+     2229, 2222, 2237, 2230, 2236, 3939, 3939, 2233, 2238, 2234,
+     2240, 2241, 2249, 2248, 2250, 3939, 2254, 2251, 2255, 2256,
+     2257, 2265, 2263, 2266, 3939, 2267, 2274, 2269, 2277, 2275,
 
-     2286, 3886, 2282, 2280, 2291, 2276, 2292, 2293, 2294, 2295,
-     2296, 2298, 2299, 2300, 2304, 2313, 2305, 2309, 2311, 2317,
-     2312, 2322, 2314, 2324, 2325, 2338, 2327, 3886, 2339, 2318,
-     2342, 2340, 2344, 2345, 2352, 2341, 2348, 2349, 2356, 2350,
-     3886, 2357, 2358, 2362, 2359, 2363, 2366, 2367, 2372, 2375,
-     3886, 3886, 2378, 2377, 2380, 2259, 2381, 2382, 2383, 2388,
-     2391, 3886, 2392, 2398, 2396, 2394, 2404, 2405, 2403, 2406,
-     2409, 2410, 2412, 2413, 2417, 2415, 2419, 2421, 2423, 2424,
-     2426, 2428, 2429, 2427, 2440, 2437, 2447, 2434, 2442, 2444,
-     2454, 2451, 2462, 2463, 2452, 2459, 2465, 3886, 2467, 2466,
+     2276, 2278, 2285, 2279, 2281, 2286, 2294, 2295, 2301, 3939,
+     2302, 2296, 2304, 2306, 2308, 2310, 2309, 2311, 2312, 2314,
+     2315, 2316, 2325, 2327, 2320, 2328, 2329, 2333, 2330, 2338,
+     2334, 2340, 2342, 2348, 2351, 3939, 2357, 2344, 2358, 2345,
+     2360, 2363, 2361, 2365, 2366, 2367, 2373, 2369, 3939, 2376,
+     2374, 2372, 2381, 2382, 2390, 2383, 2385, 2394, 2397, 3939,
+     3939, 2392, 2399, 2400, 2402, 2404, 2405, 2410, 2406, 2412,
+     3939, 2414, 2421, 2417, 2418, 2427, 2429, 2434, 2430, 2436,
+     2420, 2423, 2426, 2441, 2439, 2443, 2446, 2448, 2449, 2450,
+     2451, 2452, 2453, 2460, 2456, 2471, 2454, 2464, 2461, 2479,
 
-     2468, 2469, 2477, 2473, 2481, 2474, 3886, 2482, 2483, 2488,
-     2490, 2491, 2492, 2496, 2493, 2497, 3886, 2500, 3886, 2504,
-     2502, 3886, 2503, 2509, 2510, 2512, 2513, 2516, 2518, 2519,
-     2525, 2523, 3886, 2526, 2528, 2532, 2533, 3886, 2540, 3886,
-     2529, 3886, 2534, 2536, 2548, 2544, 2551, 2553, 2557, 3886,
-     2547, 2558, 2559, 2562, 2563, 2564, 2565, 2567, 2566, 2568,
-     2569, 2570, 3886, 2575, 2572, 2573, 2581, 2587, 3886, 2588,
-     3886, 2582, 2599, 2585, 2595, 2601, 2602, 2604, 2605, 2593,
-     2615, 2612, 2606, 2608, 3886, 2614, 2618, 2621, 2624, 2622,
-     2626, 2634, 2630, 2636, 2627, 2631, 2642, 2648, 2641, 2645,
+     2477, 2485, 2487, 2466, 2483, 2491, 3939, 2488, 2489, 2490,
+     2473, 2499, 2496, 2506, 2497, 3939, 2504, 2510, 2513, 2515,
+     2503, 2516, 2519, 2520, 2508, 3939, 2525, 3939, 2528, 2521,
+     3939, 2527, 2535, 2529, 2532, 2536, 2537, 2538, 2540, 2548,
+     2544, 3939, 2550, 2546, 2552, 2557, 3939, 2560, 3939, 2547,
+     3939, 2553, 2555, 2570, 2567, 2571, 2573, 2577, 3939, 2574,
+     2578, 2579, 2582, 2583, 2585, 2587, 2588, 2586, 2590, 2589,
+     3939, 2593, 2594, 3939, 2596, 2607, 2592, 2606, 2615, 3939,
+     2616, 3939, 2603, 2619, 2602, 2621, 2627, 2630, 2631, 2620,
+     2623, 2637, 2634, 2633, 2640, 3939, 2641, 2642, 2645, 2649,
 
-     3886, 2649, 2651, 3886, 2652, 2653, 2658, 2655, 3886, 2660,
-     3886, 2661, 2659, 2662, 2663, 2669, 2670, 2678, 2664, 2680,
-     2681, 2675, 2690, 2691, 2682, 3886, 3886, 2693, 2694, 2696,
-     2697, 2700, 2701, 2709, 2705, 2707, 3886, 2708, 2711, 2713,
-     2714, 2715, 2717, 2718, 2722, 2723, 2724, 2725, 2726, 2728,
-     3886, 2731, 2732, 2737, 2738, 2741, 2742, 2743, 3886, 2745,
-     2746, 2740, 2751, 2756, 2758, 2767, 2771, 2748, 2760, 2775,
-     2777, 2779, 2768, 2781, 2772, 2783, 2785, 2786, 3886, 2788,
-     2792, 2789, 2795, 2796, 2797, 2798, 2799, 2807, 2802, 2804,
-     2809, 2811, 3886, 2812, 2813, 2816, 2818, 2824, 2820, 2826,
+     2647, 2651, 2657, 2653, 2659, 2654, 2655, 2663, 2669, 2670,
+     2672, 3939, 2673, 2675, 3939, 2674, 2676, 2677, 2681, 3939,
+     2682, 3939, 2683, 2685, 2686, 2690, 2692, 2693, 2704, 2694,
+     2701, 2707, 2706, 2715, 2708, 2698, 3939, 3939, 2721, 2717,
+     2723, 2724, 2727, 2728, 2734, 2730, 2732, 3939, 2733, 2736,
+     2737, 2738, 2740, 2743, 2747, 2749, 2750, 2742, 2751, 2744,
+     2752, 3939, 2755, 2759, 2762, 2764, 2766, 2765, 2767, 3939,
+     2769, 2772, 2776, 2778, 2780, 2784, 2791, 2795, 2781, 2797,
+     2798, 2800, 2802, 2804, 2806, 2807, 2814, 2811, 2816, 2818,
+     2808, 3939, 2819, 2821, 2822, 2831, 2825, 2773, 2832, 2833,
 
-     2817, 2829, 2833, 3886, 2834, 2835, 2827, 2837, 2838, 2844,
-     2848, 2841, 2845, 2851, 2847, 2862, 2863, 3886, 2855, 3886,
-     2864, 2865, 2874, 2870, 2858, 3886, 2868, 2872, 3886, 2876,
-     3886, 2882, 2884, 2877, 2886, 2891, 3886, 2893, 2887, 2894,
-     2896, 2899, 2900, 2902, 3886, 2905, 2904, 2911, 2912, 2906,
-     2914, 2915, 2916, 2918, 2922, 2928, 2924, 3886, 2921, 2931,
-     2940, 2925, 2939, 3886, 3886, 2932, 2942, 3886, 3886, 3886,
-     2945, 3886, 2947, 3886, 3886, 2948, 2950, 3886, 2952, 3886,
-     2959, 2955, 2957, 2958, 2961, 3886, 2960, 2962, 2964, 3886,
-     2967, 2975, 2968, 2969, 3886, 2972, 3886, 2977, 2981, 2978,
+     2837, 2823, 2838, 2828, 2840, 3939, 2844, 2845, 2846, 2848,
+     2851, 2854, 2856, 2857, 2858, 2860, 3939, 2862, 2865, 2863,
+     2866, 2871, 2867, 2875, 2876, 2877, 2878, 2881, 2889, 2890,
+     3939, 2882, 3939, 2896, 2897, 2904, 2900, 2893, 3939, 2903,
+     2907, 3939, 2908, 3939, 2911, 2912, 2906, 2910, 2924, 3939,
+     2928, 2919, 2929, 2925, 2921, 2931, 2938, 3939, 2932, 2940,
+     2942, 2944, 2934, 2945, 2946, 2947, 2948, 2952, 2958, 2955,
+     3939, 2956, 2959, 2967, 2963, 2973, 3939, 3939, 2966, 2969,
+     2974, 2976, 2978, 3939, 3939, 3939, 2982, 3939, 2983, 3939,
+     3939, 2984, 2986, 3939, 2988, 3939, 2995, 2991, 2993, 2994,
 
-     2985, 2988, 2994, 2996, 2989, 2991, 2997, 2999, 3000, 3002,
-     3003, 3004, 3006, 3007, 3010, 3013, 3015, 3017, 3018, 3019,
-     3021, 3022, 3023, 3026, 3029, 3038, 3043, 3046, 3886, 3886,
-     3035, 3039, 3027, 3044, 3050, 3048, 3051, 3052, 3886, 3061,
-     3054, 3056, 3058, 3062, 3066, 3067, 3070, 3071, 3073, 3080,
-     3076, 3078, 3079, 3082, 3081, 3886, 3083, 3088, 3886, 3886,
-     3089, 3096, 3103, 3091, 3095, 3105, 3108, 3886, 3100, 3110,
-     3117, 3111, 3886, 3119, 3120, 3122, 3126, 3886, 3886, 3886,
-     3127, 3123, 3129, 3131, 3130, 3132, 3133, 3136, 3886, 3134,
-     3138, 3141, 3147, 3151, 3154, 3148, 3156, 3163, 3159, 3166,
+     2998, 3939, 2996, 2999, 3005, 3939, 2997, 3012, 3000, 3008,
+     3939, 3014, 3939, 3017, 3019, 3010, 3020, 3027, 3029, 3031,
+     3032, 3033, 3034, 3036, 3037, 3038, 3040, 3039, 3042, 3043,
+     3046, 3047, 3053, 3054, 3055, 3056, 3061, 3058, 3060, 3063,
+     3074, 3065, 3081, 3083, 3939, 3939, 3071, 3075, 3073, 3077,
+     3085, 3086, 3087, 3088, 3939, 3099, 3092, 3090, 3096, 3100,
+     3102, 3104, 3107, 3109, 3111, 3117, 3113, 3114, 3116, 3119,
+     3118, 3121, 3125, 3132, 3939, 3127, 3126, 3939, 3939, 3133,
+     3137, 3143, 3139, 3144, 3147, 3148, 3939, 3149, 3151, 3157,
+     3150, 3939, 3159, 3160, 3166, 3168, 3939, 3939, 3939, 3169,
 
-     3168, 3886, 3886, 3157, 3174, 3171, 3172, 3173, 3176, 3178,
-     3179, 3180, 3886, 3185, 3189, 3181, 3183, 3193, 3195, 3197,
-     3200, 3886, 3187, 3190, 3201, 3208, 3203, 3205, 3211, 3213,
-     3216, 3218, 3886, 3217, 3219, 3886, 3221, 3227, 3228, 3886,
-     3229, 3886, 3234, 3886, 3886, 3231, 3235, 3238, 3239, 3245,
-     3247, 3249, 3240, 3250, 3257, 3254, 3255, 3886, 3886, 3261,
-     3262, 3263, 3270, 3886, 3886, 3266, 3272, 3268, 3274, 3267,
-     3277, 3276, 3278, 3280, 3279, 3281, 3283, 3293, 3286, 3295,
-     3296, 3299, 3301, 3303, 3304, 3886, 3306, 3308, 3307, 3886,
-     3309, 3314, 3315, 3317, 3318, 3335, 3328, 3320, 3886, 3322,
+     3161, 3171, 3172, 3173, 3175, 3174, 3177, 3939, 3176, 3182,
+     3189, 3186, 3196, 3198, 3192, 3200, 3207, 3203, 3210, 3212,
+     3939, 3939, 3204, 3218, 3215, 3216, 3214, 3220, 3222, 3224,
+     3225, 3939, 3228, 3227, 3188, 3226, 3233, 3234, 3240, 3236,
+     3939, 3238, 3244, 3246, 3248, 3249, 3250, 3251, 3253, 3254,
+     3256, 3262, 3255, 3267, 3939, 3269, 3258, 3939, 3270, 3275,
+     3276, 3939, 3279, 3939, 3282, 3939, 3939, 3277, 3283, 3286,
+     3287, 3293, 3295, 3299, 3288, 3296, 3305, 3302, 3303, 3939,
+     3939, 3309, 3311, 3312, 3319, 3939, 3939, 3315, 3313, 3316,
+     3317, 3322, 3323, 3325, 3326, 3328, 3327, 3332, 3338, 3340,
 
-     3332, 3886, 3321, 3886, 3886, 3886, 3337, 3338, 3336, 3886,
-     3343, 3349, 3886, 3352, 3347, 3340, 3359, 3355, 3357, 3361,
-     3363, 3364, 3366, 3886, 3367, 3368, 3370, 3371, 3373, 3372,
-     3374, 3375, 3380, 3382, 3378, 3392, 3393, 3886, 3396, 3398,
-     3400, 3886, 3402, 3399, 3385, 3403, 3886, 3406, 3409, 3410,
-     3414, 3416, 3411, 3417, 3418, 3421, 3424, 3425, 3886, 3428,
-     3431, 3433, 3434, 3435, 3442, 3441, 3444, 3886, 3446, 3447,
-     3886, 3449, 3450, 3453, 3452, 3461, 3463, 3465, 3468, 3886,
-     3470, 3886, 3886, 3471, 3886, 3475, 3476, 3477, 3478, 3480,
-     3481, 3886, 3886, 3483, 3485, 3488, 3886, 3482, 3489, 3494,
+     3343, 3344, 3347, 3329, 3348, 3350, 3351, 3939, 3353, 3358,
+     3354, 3939, 3363, 3360, 3939, 3356, 3369, 3373, 3366, 3364,
+     3381, 3378, 3383, 3939, 3384, 3382, 3939, 3385, 3939, 3939,
+     3939, 3390, 3386, 3388, 3939, 3396, 3398, 3939, 3404, 3400,
+     3405, 3411, 3407, 3408, 3412, 3419, 3415, 3417, 3939, 3418,
+     3420, 3422, 3423, 3427, 3424, 3426, 3429, 3438, 3434, 3432,
+     3444, 3441, 3939, 3450, 3452, 3939, 3454, 3456, 3939, 3463,
+     3445, 3447, 3455, 3939, 3466, 3457, 3459, 3469, 3473, 3464,
+     3475, 3476, 3478, 3479, 3484, 3939, 3480, 3486, 3488, 3489,
+     3490, 3498, 3495, 3500, 3939, 3502, 3497, 3939, 3504, 3505,
 
-     3492, 3495, 3496, 3500, 3501, 3505, 3506, 3886, 3886, 3507,
-     3886, 3513, 3521, 3524, 3886, 3886, 3886, 3523, 3886, 3525,
-     3886, 3531, 3515, 3532, 3886, 3535, 3536, 3886, 3537, 3508,
-     3538, 3541, 3543, 3544, 3545, 3547, 3548, 3552, 3553, 3554,
-     3560, 3886, 3886, 3564, 3886, 3566, 3886, 3567, 3572, 3886,
-     3498, 3574, 3568, 3578, 3886, 3886, 3579, 3561, 3580, 3581,
-     3584, 3587, 3585, 3886, 3886, 3886, 3588, 3886, 3589, 3590,
-     3592, 3886, 3596, 3595, 3597, 3599, 3598, 3600, 3604, 3602,
-     3612, 3609, 3621, 3624, 3626, 3627, 3613, 3615, 3633, 3629,
-     3635, 3886, 3636, 3886, 3886, 3637, 3644, 3645, 3641, 3646,
+     3507, 3514, 3518, 3523, 3525, 3515, 3939, 3527, 3939, 3939,
+     3939, 3528, 3939, 3531, 3532, 3533, 3534, 3536, 3537, 3939,
+     3939, 3539, 3541, 3544, 3939, 3538, 3545, 3550, 3548, 3551,
+     3552, 3556, 3557, 3561, 3562, 3939, 3939, 3563, 3939, 3569,
+     3577, 3580, 3939, 3939, 3939, 3579, 3939, 3581, 3939, 3587,
+     3571, 3588, 3939, 3591, 3592, 3939, 3593, 3564, 3594, 3597,
+     3599, 3600, 3601, 3603, 3604, 3608, 3609, 3610, 3616, 3939,
+     3939, 3620, 3939, 3622, 3939, 3623, 3628, 3939, 3554, 3630,
+     3624, 3634, 3939, 3939, 3508, 3617, 3635, 3636, 3637, 3640,
+     3638, 3939, 3939, 3939, 3642, 3939, 3643, 3644, 3646, 3939,
 
-     3642, 3886, 3648, 3647, 3650, 3652, 3649, 3653, 3664, 3654,
-     3670, 3667, 3674, 3675, 3657, 3682, 3684, 3678, 3681, 3686,
-     3692, 3688, 3689, 3886, 3690, 3691, 3693, 3696, 3697, 3694,
-     3701, 3703, 3713, 3706, 3708, 3716, 3718, 3719, 3721, 3722,
-     3724, 3723, 3886, 3725, 3727, 3731, 3733, 3736, 3734, 3738,
-     3739, 3744, 3747, 3746, 3749, 3751, 3886, 3755, 3886, 3886,
-     3756, 3759, 3762, 3764, 3766, 3886, 3886, 3886, 3794, 3801,
-     3808, 3815, 3822,   94, 3829, 3836, 3843, 3850, 3857, 3864,
-     3871, 3878
+     3648, 3650, 3651, 3653, 3652, 3655, 3657, 3661, 3666, 3667,
+     3674, 3678, 3679, 3682, 3669, 3675, 3688, 3685, 3692, 3939,
+     3686, 3939, 3939, 3689, 3698, 3700, 3696, 3702, 3697, 3939,
+     3703, 3704, 3705, 3706, 3707, 3709, 3720, 3711, 3712, 3722,
+     3724, 3728, 3721, 3736, 3735, 3732, 3737, 3738, 3746, 3742,
+     3745, 3939, 3743, 3744, 3747, 3749, 3750, 3754, 3752, 3764,
+     3767, 3755, 3769, 3753, 3774, 3770, 3775, 3778, 3779, 3780,
+     3939, 3781, 3783, 3785, 3787, 3789, 3791, 3792, 3793, 3796,
+     3798, 3801, 3803, 3807, 3939, 3808, 3939, 3939, 3812, 3809,
+     3815, 3819, 3821, 3939, 3939, 3939, 3847, 3854, 3861, 3868,
+
+     3875,   94, 3882, 3889, 3896, 3903, 3910, 3917, 3924, 3931
     } ;
 
-static yyconst flex_int16_t yy_def[1983] =
+static yyconst flex_int16_t yy_def[2011] =
     {   0,
-     1968,    1, 1969, 1969, 1970, 1970, 1971, 1971, 1972, 1972,
-     1973, 1973, 1968, 1974, 1968, 1968, 1968, 1968, 1975, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1976, 1968, 1968, 1968, 1976, 1977, 1968, 1968, 1968, 1977,
-     1978, 1968, 1968, 1968, 1968, 1978, 1979, 1968, 1968, 1968,
-     1979, 1980, 1968, 1981, 1968, 1980, 1980, 1974, 1974, 1968,
-     1982, 1975, 1982, 1975, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
+     1996,    1, 1997, 1997, 1998, 1998, 1999, 1999, 2000, 2000,
+     2001, 2001, 1996, 2002, 1996, 1996, 1996, 1996, 2003, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2004, 1996, 1996, 1996, 2004, 2005, 1996, 1996, 1996, 2005,
+     2006, 1996, 1996, 1996, 1996, 2006, 2007, 1996, 1996, 1996,
+     2007, 2008, 1996, 2009, 1996, 2008, 2008, 2002, 2002, 1996,
+     2010, 2003, 2010, 2003, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1976, 1976,
-     1977, 1977, 1978, 1978, 1968, 1979, 1979, 1980, 1980, 1981,
-     1981, 1980, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2004, 2004,
+     2005, 2005, 2006, 2006, 1996, 2007, 2007, 2008, 2008, 2009,
+     2009, 2008, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1980, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1980, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2008, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2008,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1968, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1968, 1980, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 1996,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 1996, 2008, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1980,
-     1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974, 1974,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2008, 2002, 2002, 2002, 2002, 2002, 1996, 2002,
 
-     1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1968, 1968,
-     1974, 1968, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996,
+     2002, 1996, 1996, 2002, 1996, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1980, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974,
+     2002, 2002, 2002, 2002, 2002, 2008, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1980, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
+     2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 1996, 2002, 2008, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974,
+     2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1968, 1974,
-     1974, 1974, 1968, 1974, 1968, 1974, 1974, 1968, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968,
-     1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
+     1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 1996, 2002, 1996, 2002, 2002, 2002, 1996,
+     2002, 1996, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002,
+     2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968,
-     1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1968, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1968, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 1996, 2002, 1996, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 1996, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1968, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996,
+     1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1968, 1974,
-     1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1968, 1974, 1974, 1974, 1974, 1968, 1974, 1968,
-     1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974, 1968, 1974,
-     1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
+     2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 2002, 1996, 2002, 2002,
+     1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 1996, 2002, 2002, 2002, 2002, 1996, 2002, 1996, 2002,
+     1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     1996, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 1996,
+     2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
 
-     1968, 1974, 1974, 1968, 1974, 1974, 1974, 1974, 1968, 1974,
-     1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1968, 1968, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 1996, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 1996,
+     2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 1996, 1996, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1968,
-     1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974, 1968, 1974,
-     1968, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
-     1974, 1974, 1974, 1968, 1968, 1974, 1974, 1968, 1968, 1968,
-     1974, 1968, 1974, 1968, 1968, 1974, 1974, 1968, 1974, 1968,
-     1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974, 1968,
-     1974, 1974, 1974, 1974, 1968, 1974, 1968, 1974, 1974, 1974,
+     2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     1996, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 1996, 2002,
+     2002, 1996, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 1996,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     1996, 2002, 2002, 2002, 2002, 2002, 1996, 1996, 2002, 2002,
+     2002, 2002, 2002, 1996, 1996, 1996, 2002, 1996, 2002, 1996,
+     1996, 2002, 2002, 1996, 2002, 1996, 2002, 2002, 2002, 2002,
 
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1968,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974, 1968, 1968,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
-     1974, 1974, 1968, 1974, 1974, 1974, 1974, 1968, 1968, 1968,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
+     2002, 1996, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
+     1996, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 1996, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 1996, 2002, 2002, 1996, 1996, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002,
+     2002, 1996, 2002, 2002, 2002, 2002, 1996, 1996, 1996, 2002,
 
-     1974, 1968, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1968, 1974, 1974, 1968, 1974, 1974, 1974, 1968,
-     1974, 1968, 1974, 1968, 1968, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1968, 1974,
-     1974, 1974, 1974, 1968, 1968, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974, 1968,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     1996, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 1996, 2002, 2002, 1996, 2002, 2002,
+     2002, 1996, 2002, 1996, 2002, 1996, 1996, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996,
+     1996, 2002, 2002, 2002, 2002, 1996, 1996, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
 
-     1974, 1968, 1974, 1968, 1968, 1968, 1974, 1974, 1974, 1968,
-     1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
-     1974, 1968, 1974, 1974, 1974, 1974, 1968, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1974,
-     1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968,
-     1974, 1968, 1968, 1974, 1968, 1974, 1974, 1974, 1974, 1974,
-     1974, 1968, 1968, 1974, 1974, 1974, 1968, 1974, 1974, 1974,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002,
+     2002, 1996, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 1996, 2002, 2002, 1996, 2002, 1996, 1996,
+     1996, 2002, 2002, 2002, 1996, 2002, 2002, 1996, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 1996, 2002, 2002, 1996, 2002, 2002, 1996, 2002,
+     2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 1996, 2002, 2002, 1996, 2002, 2002,
 
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1968, 1968, 1974,
-     1968, 1974, 1974, 1974, 1968, 1968, 1968, 1974, 1968, 1974,
-     1968, 1974, 1974, 1974, 1968, 1974, 1974, 1968, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1968, 1968, 1974, 1968, 1974, 1968, 1974, 1974, 1968,
-     1974, 1974, 1974, 1974, 1968, 1968, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1968, 1968, 1968, 1974, 1968, 1974, 1974,
-     1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1968, 1974, 1968, 1968, 1974, 1974, 1974, 1974, 1974,
+     2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 1996, 1996,
+     1996, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 1996,
+     1996, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 1996, 1996, 2002, 1996, 2002,
+     2002, 2002, 1996, 1996, 1996, 2002, 1996, 2002, 1996, 2002,
+     2002, 2002, 1996, 2002, 2002, 1996, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996,
+     1996, 2002, 1996, 2002, 1996, 2002, 2002, 1996, 2002, 2002,
+     2002, 2002, 1996, 1996, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 1996, 1996, 1996, 2002, 1996, 2002, 2002, 2002, 1996,
 
-     1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1968, 1974, 1974, 1974, 1974, 1974, 1974, 1974,
-     1974, 1974, 1974, 1974, 1974, 1974, 1968, 1974, 1968, 1968,
-     1974, 1974, 1974, 1974, 1974, 1968, 1968,    0, 1968, 1968,
-     1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
-     1968, 1968
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996,
+     2002, 1996, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 1996,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002,
+     2002, 2002, 2002, 2002, 1996, 2002, 1996, 1996, 2002, 2002,
+     2002, 2002, 2002, 1996, 1996,    0, 1996, 1996, 1996, 1996,
+
+     1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996
     } ;
 
-static yyconst flex_uint16_t yy_nxt[3926] =
+static yyconst flex_uint16_t yy_nxt[3979] =
     {   0,
        14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
        14,   18,   20,   21,   14,   22,   23,   24,   25,   14,
@@ -1138,396 +1148,401 @@ static yyconst flex_uint16_t yy_nxt[3926] =
        69,   69,   69,  230,   69,  232,   69,  231,   69,  233,
 
       235,   69,   69,  236,   69,   69,  241,  242,   69,  224,
-       69,  260,   69,  243,  225,   69,  238,  239,   69,  226,
-      240,   69,  244,  249,  227,   69,  250,  245,   69,   69,
-      228,  229,  247,  251,  248,  253,   69,  256,   69,  682,
-       69,  246,   69,   69,  252,  254,  258,  259,  257,   69,
-      255,   69,   69,   69,   69,   69,   69,   69,   69,  262,
-       69,  264,  261,   69,   69,  266,   69,   69,  268,   69,
-      134,  267,  271,   69,  263,  269,  275,   69,  265,  277,
-       69,   69,   69,   69,  270,  279,   69,  278,  272,  276,
-       69,  273,  274,   69,  282,  281,  139,  283,  285,   69,
+       69,  261,   69,  243,  225,  134,  238,  239,   69,  226,
+      240,   69,  244,  250,  227,   69,  251,  245,   69,   69,
+      228,  229,  248,  252,  249,  254,   69,  257,   69,  246,
+       69,  247,   69,   69,  253,  255,  259,  260,  258,   69,
+      256,   69,   69,   69,   69,   69,   69,   69,   69,  263,
+       69,  265,  262,   69,   69,  267,   69,   69,  269,   69,
+      132,  268,  272,   69,  264,  270,  276,   69,  266,  278,
+       69,   69,   69,   69,  271,  280,   69,  279,  273,  277,
+       69,  274,  275,   69,  283,  282,  139,  284,  286,   69,
 
-       69,  280,   69,   69,   69,   69,  286,  292,  289,  288,
-       69,  294,   69,  291,   69,  293,   69,   69,  290,   69,
-      284,   69,   69,  287,  300,  299,   69,   69,  301,  295,
-      298,   69,  302,  297,  303,  296,   69,   69,   69,  304,
-       69,  305,   69,  306,   69,  308,   69,  311,  309,   69,
-       69,  307,   69,  313,   69,  310,   69,  314,   69,  315,
-      316,   69,   69,  312,   69,   69,   69,  321,   69,   69,
-      317,  322,   69,   69,   69,  328,  324,  320,   69,  318,
-       69,   69,   69,  319,  329,   69,   69,  323,   69,   69,
-      327,  325,  326,   69,  330,  331,   69,  335,  337,   69,
+       69,  281,   69,   69,   69,   69,  287,  293,  290,  289,
+       69,  295,   69,  292,   69,  294,   69,   69,  291,   69,
+      285,   69,   69,  288,  301,  300,   69,   69,  302,  296,
+      299,   69,  303,  298,  304,  297,   69,   69,   69,  305,
+       69,  306,   69,  307,   69,  309,   69,  312,  310,   69,
+       69,  308,   69,  314,   69,  311,   69,  315,   69,  316,
+      317,   69,   69,  313,   69,   69,   69,  322,   69,   69,
+      318,  323,   69,   69,   69,  327,  325,  321,   69,  319,
+       69,  330,   69,  320,   69,  331,   69,  324,   69,   69,
+       69,  326,  329,  333,   69,   69,  328,   69,  337,   69,
 
-       69,  339,  340,  332,  333,  338,  334,  341,   69,   69,
-      336,   69,  342,  343,   69,  345,  344,  348,   69,   69,
-      346,   69,  350,  347,  349,   69,   69,   69,   69,  355,
-       69,  352,   69,   69,   69,   69,  358,  357,  359,  353,
-      351,   69,   69,   69,   69,   69,   69,  365,  354,  360,
-      356,  364,   69,   69,   69,   69,  367,  361,  366,  370,
-      362,  382,  363,   69,  368,  369,  372,   69,  371,  374,
-      384,  139,   69,   69,  385,   69,  383,  132,   69,  390,
-       69,   69,  373,   69,   69,  375,  376,   69,  388,   69,
-       69,  387,  386,   69,  394,  377,  393,  378,  379,  380,
+      332,  334,  335,   69,  336,  341,  342,  339,  130,  340,
+      347,  338,  343,   69,   69,   69,  345,  344,   69,  346,
+      350,   69,   69,   69,  348,   69,  352,  349,  351,   69,
+       69,   69,   69,  357,  354,   69,   69,  353,   69,  360,
+      359,  361,  355,   69,   69,   69,   69,   69,  367,   69,
+       69,  356,  358,   69,  366,  368,   69,  362,   69,  369,
+      363,  374,  372,  364,   69,  365,   69,  370,   69,  371,
+      373,  139,   69,   69,  428,  385,   69,  375,  376,   69,
+      386,  377,  378,  384,  387,   69,   69,  390,   69,   69,
+       69,  379,  388,  380,  381,  382,  391,  392,  383,   69,
 
-      389,  391,  381,  396,   69,  395,   69,  392,   69,  400,
-       69,   69,   69,  397,   69,   69,  398,  402,  403,  404,
-      399,   69,   69,   69,   69,   69,  401,  409,  410,  408,
-       69,  405,   69,   69,  411,   69,   69,   69,  406,  407,
-       69,  420,  417,   69,  414,  416,   69,  413,   69,  419,
-      412,   69,  418,   69,   69,  423,   69,  415,   69,  422,
-       69,  424,   69,  425,  421,  426,  429,  427,   69,  428,
-       69,   69,   69,   69,  430,   69,   69,  432,   69,  431,
-      435,   69,  433,   69,  436,   69,  437,  434,   69,  439,
-       69,  440,   69,   69,   69,   69,   69,   69,   69,  438,
+       69,   69,   69,  398,   69,  389,  396,   69,   69,  394,
+      399,  393,  402,   69,  395,  397,  400,   69,   69,  405,
+      406,  401,   69,  404,   69,   69,   69,   69,   69,  403,
+      411,   69,   69,   69,   69,   69,  412,  413,   69,   69,
+      430,  408,  409,   69,  407,  410,   69,  416,  418,  415,
+       69,  419,  414,   69,  420,   69,  422,   69,   69,  425,
+      417,   69,  421,  424,  423,   69,   69,   69,  431,  432,
+      426,  429,   69,   69,   69,   69,  433,   69,  427,   69,
+      435,   69,   69,  439,   69,  438,  436,   69,   69,  440,
+       69,  437,   69,  442,  434,   69,  443,   69,  445,   69,
 
-      442,   69,  443,  450,   69,   69,  441,  445,   69,  452,
-      451,   69,  449,  453,  444,  446,  448,  447,  454,  455,
-       69,   69,   69,   69,   69,  459,   69,   69,   69,   69,
-       69,  461,   69,  457,  473,   69,   69,  460,  475,   69,
-       69,  458,  456,  462,  474,  472,   69,  463,   69,  464,
-      470,  471,   69,  477,  465,   69,  466,   69,  479,   69,
-      476,  478,   69,   69,  467,  483,   69,  468,   69,   69,
-      480,  481,   69,  485,  469,  486,   69,  482,   69,  139,
-       69,  491,  489,  490,   69,  484,   69,  488,  487,   69,
-      492,   69,  496,   69,   69,  498,   69,  494,  493,  495,
+       69,   69,   69,   69,   69,  453,  446,   69,  441,  444,
+       69,   69,  448,  454,   69,  456,  455,  452,  457,  447,
+      449,  451,  450,   69,  458,   69,   69,   69,   69,   69,
+      462,   69,   69,  464,   69,  476,  460,   69,   69,   69,
+       69,  478,  463,   69,   69,  477,  461,  459,  465,   69,
+      466,   69,  467,   69,  473,  475,  474,  468,   69,  469,
+       69,  480,   69,  479,   69,  482,   69,  470,  483,  481,
+      471,  487,   69,  485,  484,   69,   69,  472,   69,  139,
+      488,  489,   69,  493,  494,  486,   69,   69,  492,   69,
+       69,   69,   69,  491,   69,  490,  499,   69,  495,  498,
 
-       69,  497,   69,   69,   69,  500,  499,  503,  502,   69,
-      506,  501,   69,   69,  507,   69,  509,   69,  510,   69,
-      512,   69,  511,  513,   69,  504,  508,   69,  505,  514,
-       69,   69,   69,  515,   69,  516,  518,  519,   69,   69,
-       69,  523,   69,  520,   69,  521,   69,   69,   69,  524,
-      517,  526,   69,   69,  530,   69,  527,   69,  522,  534,
-      528,  525,  532,   69,   69,   69,   69,   69,   69,  536,
-      529,  537,   69,  531,  535,   69,   69,  533,   69,   69,
-      539,  540,   69,  543,  541,  542,  546,   69,   69,   69,
-       69,   69,  548,  538,  545,  544,  547,   69,   69,  553,
+       69,  501,   69,  497,  500,  496,   69,   69,   69,  504,
+      503,   69,  502,  505,  506,  509,   69,   69,  507,  510,
+       69,  508,  512,   69,  513,   69,  514,  515,   69,  511,
+      517,   69,  516,   69,   69,   69,   69,   69,  518,  519,
+      522,  521,   69,   69,   69,   69,  523,  526,  524,   69,
+       69,   69,   69,  529,  527,  520,   69,   69,  530,   69,
+      533,   69,  531,   69,  525,  528,  535,   69,  536,   69,
+       69,  538,   69,  540,  532,  534,   69,  543,  539,   69,
+       69,  537,   69,  541,   69,  544,   69,   69,   69,  550,
+       69,  547,   69,   69,   69,  552,  551,  546,  545,   69,
 
-      549,   69,  552,  550,   69,  551,  554,  555,   69,   69,
-       69,  556,   69,  558,  557,   69,  562,  559,   69,   69,
-       69,   69,  564,  560,   69,   69,  569,  567,  561,  563,
-      566,  568,   69,   69,   69,   69,  571,  565,   69,   69,
-       69,   69,   69,   69,   69,  576,   69,   69,   69,  582,
-       69,  577,  570,  572,   69,   69,  573,   69,  574,  578,
-      575,  579,  581,   69,  585,  580,   69,  583,  587,  584,
-      586,   69,   69,   69,  590,   69,  588,   69,   69,   69,
-       69,   69,  592,  593,  594,  595,  591,   69,  589,   69,
-      599,   69,  596,   69,  139,   69,  598,  597,  603,  602,
+      549,   69,  553,  548,   69,  542,  554,  557,   69,  559,
+       69,  555,   69,  558,   69,  561,   69,  562,  556,  560,
+       69,  563,   69,   69,  566,   69,   69,   69,   69,   69,
+      568,  570,   69,  564,  567,  571,  565,   69,   69,  572,
+       69,   69,   69,  573,  575,  569,   69,  574,   69,   69,
+      576,   69,  580,   69,   69,  577,   69,  578,  581,  586,
+       69,   69,   69,  589,   69,   69,  579,   69,  582,  583,
+       69,  585,  592,  584,  590,   69,  591,   69,   69,  587,
+      588,   69,   69,   69,   69,  596,   69,  597,   69,  599,
+      598,  593,   69,  600,  595,   69,  594,   69,   69,  602,
 
-       69,   69,  601,   69,  604,  600,   69,  606,  609,   69,
-       69,   69,  608,   69,  611,  607,   69,   69,   69,  614,
-       69,   69,  605,  612,   69,  615,   69,   69,   69,  610,
-       69,   69,   69,  626,  613,  627,  616,  625,  624,   69,
-      628,  623,  629,   69,  656,  617,   69,   69,  637,   69,
-      638,  618,   69,   69,   69,  619,  640,  130,  620,  641,
-       69,  642,   69,  643,   69,  621,  649,  644,  622,   69,
-      630,  631,   69,  632,  639,   69,  633,   69,  645,   69,
-      646,  634,  647,   69,   69,   69,   69,  635,  636,  648,
-       69,  650,   69,  654,  653,   69,   69,   69,  660,   69,
+      139,   69,   69,   69,  601,  606,  603,  605,   69,  604,
+       69,  607,   69,  610,  608,   69,   69,   69,  613,   69,
+      617,  611,  609,   69,  612,   69,   69,  618,  621,  615,
+       69,  616,   69,   69,  619,  620,  614,   69,   69,   69,
+       69,  632,  622,  631,   69,  627,  623,  629,   69,  624,
+      628,   69,  633,   69,  630,   69,  625,   69,  641,  626,
+       69,  634,  635,   69,  636,   69,  644,  637,   69,  642,
+      645,   69,  638,   69,  647,  646,   69,  654,  639,  640,
+      643,   69,  649,   69,   69,   69,   69,  651,  650,   69,
+      652,  648,   69,   69,  653,   69,   69,  659,   69,   69,
 
-       69,  661,  659,  651,  652,  655,   69,  662,  658,   69,
-       69,   69,   69,  657,  663,  664,   69,   69,  665,   69,
-       69,   69,  671,   69,  666,  668,  669,   69,  674,   69,
-       69,   69,   69,   69,   69,  667,  672,  673,   69,   69,
-      670,  676,  678,  677,   69,  679,   69,  680,   69,  675,
-       69,  683,   69,  681,   69,  686,   69,   69,   69,  684,
-       69,   69,   69,   69,  692,  685,   69,  691,   69,   69,
-       69,  139,  695,  687,  688,   69,  698,  690,  689,  693,
-      696,  694,  702,  697,  699,   69,  700,   69,  703,  701,
-       69,   69,   69,   69,  704,   69,   69,   69,  710,   69,
+       69,   69,  139,  658,   69,  655,  664,  665,   69,  656,
+      666,   69,  657,  660,  661,   69,  663,  662,  667,   69,
+       69,   69,  668,   69,   69,   69,  669,   69,   69,  670,
+      675,   69,  671,  673,  674,  676,   69,   69,   69,  679,
+      677,   69,   69,  672,   69,  678,   69,   69,   69,  683,
+      681,  682,   69,  685,   69,   69,   69,  680,  688,   69,
+       69,  684,   69,  686,  691,   69,  689,   69,   69,   69,
+       69,   69,   69,  697,   69,   69,  696,  690,  687,  700,
+       69,  692,  693,   69,   69,   69,  701,  694,  695,  698,
+      703,  699,  704,   69,  702,  705,  707,  706,  708,   69,
 
-      708,  711,  712,   69,  706,   69,   69,   69,  715,   69,
-      705,   69,  707,   69,  717,   69,   69,  709,  714,  719,
-      139,  713,   69,   69,  720,   69,  721,  716,   69,  718,
-       69,  732,   69,   69,   69,  722,  733,  736,   69,  724,
-       69,   69,   69,   69,  137,   69,  738,  723,  725,   69,
-      745,   69,  726,  734,  727,  737,  739,  740,  728,  735,
-      729,   69,   69,   69,   69,  730,  741,   69,  743,   69,
-      731,   69,  747,  775,  750,   69,  742,  749,  744,   69,
-      758,  746,   69,  748,  751,   69,   69,  752,   69,   69,
-       69,  761,  753,   69,  754,   69,  759,   69,  762,   69,
+       69,   69,   69,   69,  709,   69,  714,   69,  715,   69,
+      713,  716,  717,   69,  711,   69,   69,   69,  710,  720,
+      722,   69,  712,   69,   69,  724,  139,   69,  719,   69,
+       69,  718,   69,  726,   69,   69,   69,  721,   69,  737,
+      738,  723,  725,   69,   69,   69,   69,   69,  729,  727,
+      741,   69,   69,  768,   69,  730,  728,   69,  739,  743,
+      731,  744,  732,   69,   69,  745,  733,  742,  734,  740,
+       69,   69,   69,  735,  746,   69,  748,  750,  736,  747,
+       69,   69,  137,  755,  752,   69,  749,  754,   69,  751,
+      756,   69,   69,   69,  753,   69,  757,  762,  763,   69,
 
-      757,  760,   69,  763,   69,  755,  766,   69,  767,  768,
-       69,  764,  756,  769,   69,   69,   69,  772,  765,   69,
-       69,  770,   69,   69,  773,   69,   69,   69,  771,   69,
-       69,  779,  777,   69,  785,  774,  776,   69,   69,   69,
-       69,   69,  783,  781,  778,  135,  784,  780,   69,   69,
-      782,   69,   69,  789,  790,   69,  788,  786,  787,  794,
-      791,  792,   69,  793,   69,   69,  797,  796,   69,  799,
-      798,   69,  800,   69,   69,   69,  801,   69,  795,   69,
-       69,   69,   69,  806,   69,   69,   69,   69,  802,  809,
-      810,   69,  804,  811,   69,  803,  814,   69,  808,  805,
+       69,  758,   69,  759,   69,  766,  764,  767,   69,  771,
+       69,  765,   69,  773,  760,   69,  772,   69,   69,  770,
+      774,  761,  769,   69,  777,   69,   69,   69,   69,   69,
+      778,   69,   69,   69,  775,   69,  776,  780,   69,   69,
+      781,  783,   69,  782,  785,  779,  791,   69,   69,   69,
+       69,   69,  784,   69,   69,  786,  787,  789,  788,  790,
+       69,   69,  799,  798,   69,  795,  792,  793,  794,  796,
+       69,  800,   69,   69,  803,  797,   69,   69,  804,   69,
+       69,  805,   69,   69,  806,  801,  807,   69,   69,  802,
+       69,  808,   69,  812,   69,   69,   69,   69,   69,   69,
 
-      813,   69,  807,   69,  816,   69,  817,  812,   69,   69,
-      815,   69,  822,   69,   69,   69,   69,   69,  823,  824,
-       69,  829,   69,  818,  821,  826,   69,  819,  828,  820,
-      830,  827,   69,  825,   69,   69,  833,   69,   69,  832,
-       69,   69,  837,   69,   69,   69,   69,  831,   69,   69,
-       69,   69,   69,  836,  835,  846,   69,  834,  839,  867,
-       69,  838,   69,  840,  843,   69,  844,  842,  847,   69,
-      841,   69,  845,   69,  848,   69,  849,   69,   69,  850,
-       69,  854,  852,   69,   69,  858,   69,  855,   69,  851,
-       69,   69,   69,  853,   69,  863,   69,  861,  856,   69,
+      815,  816,  809,  810,  817,   69,  821,  811,  820,   69,
+      814,  819,   69,  813,   69,  818,   69,  823,   69,   69,
+       69,  828,   69,   69,   69,   69,   69,  829,  830,   69,
+      822,   69,  832,  827,  824,  835,  833,  825,   69,  826,
+       69,  836,  831,  834,   69,   69,   69,  839,   69,  838,
+       69,   69,  843,  837,   69,   69,   69,   69,   69,   69,
+       69,   69,  842,  852,  840,  841,  845,   69,   69,  135,
+       69,  853,  844,   69,  846,  849,   69,   69,  848,   69,
+      851,   69,  850,  847,  854,   69,  855,  856,   69,  860,
+      858,  857,   69,   69,   69,  864,   69,   69,   69,  861,
 
-       69,  864,  859,  857,   69,   69,  865,   69,  860,   69,
-      870,   69,  862,   69,  866,   69,  869,   69,  872,  874,
-       69,   69,  868,   69,   69,   69,  875,   69,  871,   69,
-      873,  879,   69,   69,   69,  876,   69,  880,  878,   69,
-      877,   69,  884,   69,  888,   69,  881,  885,  887,   69,
-      882,  883,   69,  890,  886,  889,   69,  892,   69,   69,
-      894,   69,  898,  891,  895,   69,   69,   69,  893,  901,
-       69,  902,   69,  897,   69,   69,  900,  896,   69,  899,
-      903,  904,   69,  905,   69,  907,   69,  906,   69,   69,
-       69,  912,  913,  909,   69,  908,   69,   69,   69,  914,
+       69,   69,   69,  859,   69,  869,  867,  870,  862,   69,
+       69,  865,   69,  863,   69,  873,  866,  871,   69,   69,
+       69,  868,   69,  872,  876,   69,   69,  875,   69,   69,
+      878,   69,  874,  880,   69,  881,   69,   69,   69,  877,
+       69,  879,   69,  882,  885,   69,   69,   69,  886,  884,
+      883,  890,   69,  894,   69,   69,   69,  887,   69,   69,
+      889,  888,  891,  893,  896,   69,  892,   69,   69,  895,
+      898,  899,  897,  900,   69,   69,  905,  901,   69,   69,
+       69,   69,  903,  908,   69,  909,  902,  904,   69,  907,
+       69,   69,  906,   69,   69,  910,   69,  914,  912,  913,
 
-       69,  921,  915,  910,  922,   69,   69,   69,  911,   69,
-       69,  924,   69,   69,   69,  134,  923,  928,  916,  927,
-       69,  929,   69,  917,   69,  918,   69,  919,  925,  920,
-      926,   69,  932,  931,  930,   69,   69,  937,   69,   69,
-      933,  939,   69,   69,  934,   69,  940,   69,   69,  935,
-      941,  943,   69,   69,  938,  945,   69,   69,  946,  948,
-       69,  936,   69,   69,   69,   69,  942,   69,  944,  950,
-      952,  951,   69,  953,   69,   69,   69,   69,  947,  958,
-      955,  959,  949,  956,   69,  954,   69,   69,  957,  961,
-       69,   69,  960,   69,   69,   69,  963,  965,   69,  962,
+      911,   69,   69,   69,   69, 1113,  919,  916,  920,   69,
+      915,   69,   69,   69,  921,   69,  922,  917,   69,  928,
+       69,   69,  918,   69,  929,  931,   69,   69,   69,   69,
+      932,  930,  923,   69,   69,   69,  939,  924,  934,  925,
+       69,  926,  935,  927,   69,  933,  936,   69,  937,  940,
+       69,   69,  938,  941,  944,   69,  946,   69,  942,   69,
+       69,   69,  947,  950,   69,  948,  945,   69,  952,   69,
+       69,   69,  955,   69,   69,  943,  953,   69,   69,   69,
+      949,   69,  957,  134,  959,   69,  958,  951,   69,  960,
+       69,  954,  963,   69,  956,  965,  962,  966,   69,  961,
 
-       69,  969,  964,   69,   69,   69,   69,   69,   69,  975,
-       69,   69,   69,  966,   69,  967,   69,  979,  970,  973,
-       69,  974,   69,  968,  971,  972,  980,   69,   69,  986,
-      976,   69,  978,  982,   69,  990,  977,   69,  984,  981,
-       69,  983,  985,   69,   69,  987,  988,   69,  989,   69,
-      993,  991,   69,   69,   69,   69,   69,   69,   69,  996,
-      992,  999,   69,   69,   69,   69,   69,   69,   69,   69,
-      132,  995,   69,  997, 1007, 1002,  998, 1001,  994, 1003,
-     1000, 1004, 1005, 1006,   69,   69, 1010,   69,   69,   69,
-     1009, 1008,   69, 1014, 1016, 1013, 1011, 1015,   69,   69,
+       69,   69,   69,  967,  968,   69,  964,   69,   69,   69,
+      969,  972,   69,   69,   69,  976,   69,   69,  971,   69,
+       69,   69,   69,   69,  970,   69,  982,   69,  973,  980,
+      977,  987,   69,  974,   69,   69,  978,  975,   69,  979,
+      981,  983,   69,  986,   69,  985,  991,  989,  984,   69,
+      992,   69,   69,  993,  990,   69,   69,  988,  995,  997,
+      994,   69,   69,  996,   69,  998,  999,   69,   69,   69,
+       69,   69,   69,   69, 1003,   69, 1006,   69,   69, 1025,
+       69, 1000,   69,   69,   69,   69, 1002, 1009, 1004,   69,
+     1014, 1005, 1008, 1001, 1010, 1007, 1015, 1011, 1012,   69,
 
-     1017,   69, 1018, 1012,   69,   69,   69, 1019, 1020,   69,
-       69,   69,   69,   69, 1021, 1026, 1022, 1023, 1024, 1027,
-       69, 1028,   69,   69,   69, 1029,   69,   69,   69,   69,
-     1025, 1037,   69, 1030,   69, 1036,   69,   69,   69,   69,
-       69, 1031, 1032, 1033,   69,   69, 1045, 1035, 1042,   69,
-       69, 1038, 1046, 1034, 1048,   69, 1039, 1040, 1041, 1044,
-       69, 1043, 1047,   69,   69, 1049,   69, 1050,   69,   69,
-       69,   69, 1054, 1058,   69, 1052, 1055, 1051,   69,   69,
-       69, 1053,   69, 1059, 1060, 1063,   69, 1061,   69, 1056,
-       69, 1057, 1067, 1065,   69, 1066,   69,   69,   69, 1062,
+       69,   69,   69, 1013, 1016,   69,   69,   69, 1023, 1024,
+     1018, 1020, 1022,   69,   69,   69, 1026, 1019, 1017, 1027,
+       69,   69,   69,   69,   69, 1028,   69, 1021,   69, 1031,
+     1034, 1029, 1036,   69, 1035,   69, 1037,   69,   69,   69,
+     1032, 1030,   69,   69,   69,   69,   69, 1033,   69, 1045,
+       69, 1044,   69, 1038,   69,   69,   69, 1039, 1040,   69,
+       69, 1041, 1054, 1043, 1050, 1046,   69, 1047,  132, 1042,
+       69, 1048,   69, 1053, 1049, 1052,   69, 1051, 1055, 1056,
+       69, 1057,   69, 1059,   69,   69, 1058,   69,   69,   69,
+     1062, 1066,   69, 1060, 1063,   69,   69,   69, 1061, 1071,
 
-     1064, 1068,   69, 1069,   69,   69,   69, 1072, 1071,   69,
-       69, 1074, 1070, 1073,   69, 1076, 1078,   69,   69,   69,
-       69, 1081, 1079, 1075,   69,   69,   69,   69,   69, 1077,
-     1084,   69, 1086, 1087,   69,   69, 1083,   69,   69, 1080,
-       69, 1090,   69, 1091,   69,   69, 1082, 1085,   69, 1088,
-     1096, 1089,   69, 1094, 1098, 1092,   69, 1097, 1100,   69,
-       69,   69, 1093,   69,   69, 1095, 1102,   69,   69,   69,
-     1104,   69, 1106,   69, 1101,   69, 1099,   69, 1112,   69,
-     1103, 1107, 1109,   69,   69, 1110, 1114,   69,   69, 1113,
-       69, 1117, 1105, 1108, 1118, 1115,   69, 1111,   69,   69,
+     1067, 1068,   69,   69,   69, 1069,   69, 1064, 1073, 1065,
+       69, 1074, 1075, 1076,   69,   69, 1070,   69, 1077,   69,
+     1072,   69, 1078,   69, 1079,   69, 1080,   69,   69,   69,
+     1081, 1086,   69, 1084,   69,   69,   69, 1089, 1087,   69,
+       69, 1083,   69,   69, 1085,   69, 1092,   69, 1082,   69,
+     1094, 1091, 1095,   69,   69, 1088,   69, 1098,   69, 1099,
+       69, 1090, 1093, 1097,   69, 1096,   69,   69,   69, 1104,
+       69, 1106, 1108, 1102,   69, 1105,   69,   69, 1100,   69,
+     1101, 1110,   69,   69,   69,   69, 1103,   69, 1107,   69,
+     1112,   69, 1114, 1109, 1116,   69, 1122, 1115, 1117, 1120,
 
-     1116,   69, 1119, 1123,   69, 1120, 1125,   69,   69, 1124,
-       69,   69,   69, 1128,   69, 1121,   69, 1127, 1122,   69,
-       69, 1129,   69,   69,   69,   69, 1136,   69, 1130,   69,
-     1126,   69,   69, 1141,   69, 1134, 1133, 1135,   69, 1131,
-     1132,   69,   69, 1139,   69, 1137, 1142, 1138,   69,   69,
-       69, 1144,   69, 1140, 1147, 1151,   69, 1143, 1145, 1152,
-       69, 1146,   69, 1148,   69, 1153,   69,   69, 1149, 1154,
-       69, 1157,   69, 1161,   69, 1150, 1156,   69,   69, 1160,
-       69, 1158, 1155,   69, 1159, 1162,   69,   69,   69,   69,
-     1164,   69,   69, 1171, 1163,   69,   69, 1166, 1165,   69,
+       69, 1118, 1111,   69,   69, 1121,   69, 1126, 1123, 1125,
+       69, 1127,   69, 1119, 1124,   69,   69,   69, 1131,   69,
+     1133,   69,   69,   69, 1132,   69,   69, 1135, 1136,   69,
+       69, 1137,   69, 1128,   69, 1129,   69, 1130, 1144,   69,
+       69,   69,   69,   69, 1134,   69,   69,  130, 1138,   69,
+     1141, 1142, 1139, 1143, 1140, 1149,   69,   69,   69, 1147,
+       69, 1145, 1146, 1151,   69,   69,   69, 1148,   69, 1150,
+       69, 1153, 1152, 1162, 1154,   69, 1156, 1155, 1160,   69,
+     1163, 1157, 1161,   69,   69,   69, 1158,   69,   69,   69,
+     1170, 1171,   69, 1159, 1165,   69,   69, 1169, 1167,   69,
 
-     1168,   69, 1175, 1167, 1174, 1173,   69,   69, 1180, 1170,
-       69, 1172,   69,   69, 1169, 1177, 1176, 1182, 1178, 1183,
-       69,   69, 1186,   69,   69, 1179, 1184,   69, 1181,   69,
-       69,   69, 1188,   69,   69,   69, 1187, 1195, 1189, 1191,
-       69, 1185,   69,   69, 1198,   69, 1192,   69,   69, 1190,
-       69,   69, 1193, 1201, 1194, 1200, 1196,   69,   69, 1204,
-       69, 1197, 1202, 1203,   69, 1207,   69, 1199,   69,   69,
-       69,   69,   69,   69,   69, 1213, 1209,   69, 1273, 1206,
-       69,   69, 1208, 1205, 1210, 1211, 1214, 1216,   69, 1212,
-     1217,   69,   69,   69,   69, 1215, 1218, 1219,   69, 1220,
+     1164, 1168,   69,   69,   69,   69, 1166,   69,   69,   69,
+     1180,   69, 1173,   69,   69,   69, 1172, 1175,   69, 1177,
+     1174, 1176, 1182, 1183,   69, 1184, 1179, 1181,   69, 1178,
+     1189,   69, 1188, 1190,   69,   69, 1191, 1186, 1192, 1185,
+     1187,   69,   69,   69, 1195,   69,   69, 1193,   69,   69,
+       69, 1197,   69,   69, 1194, 1196, 1204, 1198, 1200, 1201,
+       69,   69,   69,   69, 1199, 1207,   69,   69,   69,   69,
+     1202, 1209, 1203, 1210, 1211,   69, 1205,   69,   69,   69,
+     1206,   69, 1212, 1208, 1213, 1216,   69,   69,   69,   69,
+       69,   69, 1222,   69, 1215, 1217, 1218,   69,   69, 1219,
 
-     1223, 1221, 1222,   69,   69,   69,   69,   69,   69, 1224,
-       69,   69,   69, 1228, 1225, 1233,   69,   69, 1226, 1229,
-     1234,   69, 1227,   69,   69,   69,   69, 1232, 1238,   69,
-       69, 1231, 1230, 1240,   69, 1242,   69,   69, 1235,   69,
-     1236, 1243, 1245, 1237, 1239, 1244, 1246, 1241, 1247, 1248,
-       69,   69,   69,   69,   69, 1250,   69,   69, 1251, 1252,
-       69,   69,   69, 1259,   69, 1253, 1254, 1255,   69,   69,
-       69,   69, 1256, 1263,   69,   69, 1265, 1249,   69,   69,
-     1257, 1258, 1260, 1261,   69, 1268, 1269,   69, 1271,   69,
-       69, 1262,   69,   69,   69,   69, 1276, 1264, 1266, 1270,
+     1220, 1214,   69, 1223, 1225, 1226,   69,   69,   69, 1221,
+     1227, 1224, 1228,   69,   69, 1231,   69, 1230,   69, 1229,
+       69,   69,   69,   69,   69, 1233,   69,   69,   69, 1237,
+     1232, 1234,   69, 1235, 1243, 1238, 1242,   69, 1236,   69,
+       69,   69,   69, 1241, 1247,   69,   69, 1240, 1239, 1249,
+       69, 1251,   69, 1244,   69, 1253,   69,   69, 1252, 1245,
+       69, 1246, 1248,   69, 1255, 1257, 1254, 1250, 1261,   69,
+       69, 1259,   69,   69, 1256,   69, 1260,   69,   69,   69,
+     1268,   69, 1258, 1270,   69,   69,   69, 1271,   69, 1262,
+     1263, 1264, 1274,   69,   69,   69, 1265,   69, 1266, 1267,
 
-       69, 1267, 1274,   69,   69, 1280,   69, 1272,   69, 1279,
-       69, 1283, 1284, 1282, 1285,   69,   69,   69,   69, 1278,
-     1275,   69,   69, 1286,   69,   69, 1277,   69, 1281,   69,
-     1287,   69, 1291,   69, 1294,   69,   69, 1290,   69,   69,
-       69,   69, 1288, 1289, 1298, 1292,   69, 1299, 1300,   69,
-     1295, 1301,   69, 1297,   69, 1296,   69, 1293, 1304,   69,
-     1302, 1308, 1309,   69,   69, 1303,   69, 1305, 1306, 1310,
-     1312,   69, 1315, 1311,   69,   69, 1307,   69,   69,   69,
-       69,   69, 1317, 1314, 1320,   69,   69,  130, 1322,   69,
-     1313, 1316, 1318,   69,   69,   69, 1325, 1324, 1323, 1326,
+     1272, 1269,   69, 1276,   69, 1273,   69, 1279, 1280,   69,
+     1282,   69,   69, 1281,   69, 1277,   69,   69,   69, 1278,
+     1275, 1284,   69, 1287,   69, 1285,   69, 1283, 1291,   69,
+       69, 1290,   69,   69, 1294,   69, 1295, 1293,   69,   69,
+     1289,   69,   69, 1286, 1288, 1296,   69, 1297,   69, 1292,
+     1301,   69, 1299,   69, 1300,   69, 1302, 1298,   69, 1305,
+       69,   69,   69,   69,   69,   69,   69, 1309,   69, 1303,
+     1310, 1312,   69,   69, 1311, 1306,   69, 1308,   69, 1313,
+     1307, 1304, 1315,   69, 1314,   69, 1319, 1316, 1320,   69,
+     1317,   69, 1321, 1318, 1323,   69, 1322,   69, 1326,   69,
 
-       69, 1327,   69,   69,   69,   69, 1319, 1321,   69,   69,
-     1329, 1331,   69, 1330,   69,   69,   69, 1333, 1332, 1334,
-     1337,   69,   69, 1328,   69,   69, 1335, 1336,   69,   69,
-       69,   69, 1344, 1339, 1342,   69, 1343,   69,   69, 1346,
-       69,   69, 1338, 1340,   69,   69,   69, 1341,   69, 1345,
-     1347, 1351,   69, 1349, 1350, 1355,   69, 1352, 1348,   69,
-       69, 1353, 1354,   69, 1357,   69, 1360, 1358, 1359,   69,
-       69,   69, 1362, 1356,   69,   69,   69,   69,   69,   69,
-       69,   69,   69, 1363,   69,   69, 1373,   69, 1365, 1366,
-     1361, 1367, 1372,   69,   69, 1369, 1364,   69, 1375,   69,
+       69,   69,   69,   69, 1324, 1328, 1331, 1325,   69,   69,
+     1330,   69, 1327, 1333, 1329,   69,   69, 1996,   69, 1335,
+       69, 1334,   69, 1336, 1337,   69, 1338,   69,   69, 1343,
+     1332,   69,   69,   69, 1340, 1339, 1341,   69, 1342,   69,
+       69,   69, 1344, 1345,   69, 1346, 1348,   69,   69,   69,
+       69, 1347,   69, 1350, 1353, 1355,   69, 1354,   69,   69,
+       69, 1349,   69, 1357,   69,   69, 1351,   69, 1352,   69,
+     1356, 1362,   69, 1360, 1358, 1363, 1359, 1366, 1361,   69,
+     1364, 1365,   69,   69, 1368,   69,   69, 1369, 1370,   69,
+       69,   69, 1373, 1371,   69,   69, 1367,   69,   69,   69,
 
-       69, 1370, 1371, 1374, 1368,   69, 1376,   69, 1378, 1377,
-     1379,   69, 1381,   69,   69, 1382,   69,   69,   69, 1383,
-       69, 1384, 1387, 1380,   69, 1386,   69,   69, 1390, 1388,
-       69, 1389, 1393,   69,   69, 1385,   69, 1394,   69,   69,
-     1968, 1397,   69,   69, 1392, 1391,   69, 1398,   69, 1395,
-     1399, 1400, 1401,   69,   69, 1402, 1403,   69, 1396, 1404,
-       69,   69, 1405,   69,   69,   69, 1407,   69, 1408, 1406,
-       69,   69,   69,   69,   69,   69,   69, 1409, 1413, 1414,
-     1418,   69,   69, 1412, 1417, 1410, 1415,   69, 1411, 1420,
-       69, 1419,   69,   69,   69, 1421, 1422, 1425, 1423, 1416,
+       69,   69,   69, 1374,   69,   69,   69, 1381,   69, 1376,
+     1372, 1377, 1378, 1385,   69,   69, 1375, 1380,   69,   69,
+     1382, 1386, 1387, 1388, 1379, 1383, 1384,   69,   69, 1391,
+     1392,   69,   69,   69, 1389,   69, 1996, 1390, 1394,   69,
+     1393, 1395,   69,   69, 1400,   69,   69, 1396, 1397,   69,
+     1398, 1401,   69,   69,   69, 1399, 1406,   69, 1402,   69,
+     1403,   69, 1407,   69, 1410,   69,   69,   69, 1405,   69,
+     1411,   69, 1404, 1412, 1408,   69, 1414, 1416, 1413, 1415,
+     1417,   69,   69, 1409,   69,   69,   69,   69,   69,   69,
+     1420, 1418, 1421,   69,   69,   69, 1419,   69,   69, 1422,
 
-     1424, 1426,   69,   69, 1429,   69,   69, 1431,   69,   69,
-     1432, 1427,   69,   69, 1428, 1430, 1435,   69, 1437,   69,
-       69,   69, 1436,   69, 1433,   69,   69,   69, 1439,   69,
-       69, 1434, 1442, 1445,   69,   69,   69,   69,   69, 1446,
-       69, 1441, 1448,   69,   69, 1438, 1444, 1443, 1440,   69,
-       69, 1447,   69,   69,   69,   69, 1458,   69,   69, 1450,
-       69, 1459, 1451,   69, 1449, 1460, 1456, 1452,   69, 1454,
-       69, 1463,   69, 1453, 1455, 1466, 1457, 1461, 1464,   69,
-       69, 1462, 1465,   69,   69, 1467, 1468,   69, 1469,   69,
-     1470,   69, 1472,   69, 1474,   69, 1475,   69,   69, 1471,
+     1426, 1427,   69, 1431,   69,   69,   69, 1424, 1423, 1425,
+       69, 1430, 1428,   69, 1432, 1433,   69, 1435,   69,   69,
+       69, 1996, 1438, 1429, 1436, 1434, 1439,   69, 1440,   69,
+     1441, 1437, 1442,   69, 1444,   69,   69, 1445, 1443,   69,
+       69, 1448,   69, 1450,   69,   69,   69, 1449,   69,   69,
+       69, 1446,   69, 1452,   69,   69,   69, 1455, 1447,   69,
+     1458,   69,   69,   69,   69, 1454, 1459,   69, 1461, 1460,
+     1451,   69, 1453, 1456,   69, 1457,   69,   69,   69,   69,
+     1471,   69, 1462, 1463,   69,   69, 1464, 1472,   69, 1469,
+       69, 1498,   69,   69, 1465, 1467,   69, 1476, 1466, 1468,
 
-       69,   69, 1473, 1478,   69, 1477, 1480,   69,   69,   69,
-       69,   69, 1484, 1483,   69, 1482,   69, 1476, 1486,   69,
-     1479,   69, 1490,   69,   69,   69, 1481, 1485,   69,   69,
-       69, 1488,   69, 1487, 1494, 1495,   69, 1497,   69,   69,
-     1489,   69, 1499, 1493, 1491,   69,   69,   69, 1492,   69,
-       69, 1496, 1502,   69, 1500, 1498,   69,   69, 1501,   69,
-       69, 1506, 1504,   69, 1503, 1507, 1509,   69, 1508, 1512,
-       69, 1505, 1510, 1511,   69,   69,   69,   69, 1516, 1513,
-       69, 1517,   69, 1518,   69, 1515,   69, 1514,   69,   69,
-     1520, 1519, 1521, 1523,   69, 1522,   69, 1525,   69,   69,
+     1470, 1473, 1477,   69, 1474, 1475, 1478,   69, 1479,   69,
+       69, 1481,   69, 1484,   69, 1485,   69, 1486,   69,   69,
+       69, 1482, 1480,   69, 1483, 1488,   69, 1490,   69, 1491,
+       69,   69, 1494,   69,   69,   69, 1493,   69, 1487, 1492,
+       69, 1489, 1496,   69,   69,   69, 1500, 1499, 1502,   69,
+       69, 1506,   69, 1495, 1503, 1497,   69,   69,   69, 1505,
+       69, 1501, 1511,   69, 1510, 1504,   69, 1513,   69,   69,
+       69, 1515,   69, 1509,   69,   69, 1507,   69,   69,   69,
+     1508, 1516, 1518,   69, 1522, 1512, 1517,   69,   69,   69,
+       69, 1520, 1523,   69,   69, 1514, 1528, 1996, 1525, 1526,
 
-     1524, 1526, 1529,   69, 1530,   69,   69, 1532,   69, 1527,
-     1528,   69,   69, 1531,   69, 1536,   69,   69,   69, 1538,
-     1533, 1537, 1539,   69,   69, 1534,   69,   69,   69, 1540,
-       69, 1535, 1544,   69,   69, 1547,   69,   69, 1541, 1546,
-       69, 1543, 1548,   69,   69, 1552, 1542, 1551, 1550, 1549,
-     1545,   69,   69, 1553,   69, 1555, 1556,   69, 1554,   69,
-       69, 1559,   69, 1560,   69, 1558, 1561,   69, 1562,   69,
-       69,   69,   69,   69,   69, 1568,   69, 1557, 1565,   69,
-       69,   69, 1570, 1573,   69, 1563, 1567,   69, 1569,   69,
-       69, 1566, 1564,   69, 1574, 1575, 1572,   69, 1571, 1578,
+     1519,   69,   69, 1524, 1521,   69, 1529, 1527,   69,   69,
+     1532, 1533,   69, 1534, 1530,   69,   69, 1531,   69,   69,
+       69, 1535,   69,   69,   69, 1536, 1541, 1537, 1539, 1542,
+     1538,   69, 1540,   69, 1544, 1545,   69,   69, 1543, 1546,
+       69,   69, 1548,   69,   69, 1547,   69, 1550, 1553, 1549,
+       69, 1552,   69, 1555,   69, 1554,   69,   69,   69,   69,
+       69, 1556, 1551, 1560,   69, 1563, 1557,   69,   69, 1562,
+       69,   69, 1559, 1564, 1567,   69, 1566, 1558,   69,   69,
+     1561,   69, 1571, 1568, 1565,   69,   69, 1569,   69, 1572,
+       69, 1574, 1570, 1575,   69,   69,   69, 1578,   69, 1579,
 
-       69,   69, 1577,   69, 1576, 1579,   69, 1580,   69,   69,
-     1583,   69,   69, 1581,   69,   69,   69, 1589,   69,   69,
-     1587, 1582,   69, 1584, 1585,   69, 1586,   69, 1590,   69,
-       69,   69, 1596,   69,   69,   69, 1588, 1968,   69,   69,
-     1593,   69, 1597, 1600, 1595, 1592, 1601,   69, 1591, 1602,
-       69,   69, 1598, 1594, 1603,   69,   69, 1599,   69, 1604,
-       69, 1607,   69,   69,   69, 1612,   69, 1605,   69, 1606,
-       69, 1609, 1613,   69,   69, 1614, 1608, 1616,   69,   69,
-     1610, 1611,   69,   69, 1622,   69, 1615, 1623,   69, 1617,
-       69,   69,   69,   69,   69,   69, 1618, 1619, 1620, 1627,
+       69, 1577, 1580,   69, 1581,   69,   69,   69,   69,   69,
+       69,   69,   69, 1576, 1573, 1584, 1587,   69, 1588, 1589,
+       69, 1582,   69, 1586,   69, 1592,   69, 1585, 1583,   69,
+     1590,   69,   69, 1594, 1593, 1591, 1595, 1596, 1597,   69,
+     1598,   69, 1599,   69,   69,   69,   69, 1602,   69,   69,
+       69,   69,   69, 1608,   69,   69, 1600, 1606,   69,   69,
+     1603, 1604, 1605, 1601, 1609,   69,   69,   69,   69, 1615,
+       69, 1607,   69,   69, 1996,   69, 1621,   69, 1612, 1611,
+     1619, 1614, 1616,   69, 1610,   69,   69,   69, 1617,   69,
+     1613, 1620, 1622,   69, 1618,   69, 1623,   69,   69,   69,
 
-       69,   69, 1621,   69, 1629, 1625, 1624,   69,   69, 1968,
-     1626, 1632,   69, 1628, 1633,   69, 1636,   69, 1634, 1630,
-       69, 1631,   69,   69, 1637, 1635, 1639, 1638, 1640,   69,
-     1642,   69,   69, 1644,   69,   69, 1641, 1645,   69,   69,
-     1646,   69,   69,   69,   69,   69,   69, 1650,   69, 1651,
-       69, 1643, 1649,   69, 1648, 1655, 1653, 1647, 1656,   69,
-       69, 1654, 1658,   69, 1652, 1659,   69, 1660,   69,   69,
-     1662,   69, 1968, 1661, 1657,   69, 1663, 1664,   69, 1665,
-       69, 1667, 1666,   69,   69,   69,   69, 1668,   69, 1669,
-       69,   69,   69,   69, 1670,   69, 1673,   69, 1672,   69,
+       69, 1631,   69, 1624,   69, 1625, 1628, 1626,   69, 1627,
+     1632,   69,   69, 1633,   69, 1635,   69, 1630, 1629,   69,
+     1634,   69, 1641,   69, 1642,   69,   69, 1636,   69,   69,
+       69,   69, 1637,   69, 1638, 1639, 1646,   69,   69,   69,
+     1640, 1644, 1649, 1643,   69,   69, 1650, 1645, 1651,   69,
+     1647,   69, 1654, 1648, 1655,   69,   69, 1652, 1658,   69,
+       69,   69,   69,   69, 1659, 1653, 1656, 1661, 1662,   69,
+     1664,   69,   69,   69, 1657, 1663, 1660, 1666,   69, 1667,
+       69,   69, 1668,   69,   69,   69,   69,   69,   69,   69,
+     1672, 1665, 1673, 1671,   69, 1669, 1670, 1675,   69, 1677,
 
-     1675,   69,   69, 1671, 1674,   69, 1676,   69, 1678,   69,
-     1681, 1677,   69,   69, 1679,   69, 1680,   69, 1683, 1686,
-       69, 1682, 1684,   69, 1690,   69, 1688, 1689,   69,   69,
-       69,   69, 1685,   69, 1687, 1692, 1691, 1695, 1693,   69,
-       69,   69, 1698,   69, 1694, 1699,   69,   69, 1701, 1702,
-       69,   69,   69, 1696, 1703, 1697, 1704,   69, 1705,   69,
-     1706,   69,   69, 1700, 1709, 1710,   69,   69, 1712,   69,
-     1707, 1711, 1713,   69,   69,   69, 1708, 1716,   69,   69,
-       69, 1715,   69, 1717,   69, 1720,   69, 1724,   69,   69,
-       69,   69,   69,   69, 1728,   69, 1729, 1714,   69, 1722,
+       69,   69, 1996, 1676,   69, 1674, 1678, 1680,   69, 1681,
+       69, 1682,   69, 1679, 1684,   69,   69, 1683, 1699,   69,
+     1685, 1686,   69, 1687,   69, 1689,   69,   69,   69, 1688,
+       69, 1690,   69, 1691,   69, 1692,   69,   69,   69,   69,
+       69, 1695, 1694, 1697, 1698,   69,   69, 1693,   69, 1696,
+       69, 1700,   69, 1703, 1701, 1702,   69, 1704,   69, 1708,
+       69,   69,   69,   69, 1712,   69,   69,   69,   69, 1705,
+       69, 1710, 1714, 1715,   69, 1716, 1706, 1707, 1711,   69,
+     1709,   69,   69, 1719, 1717, 1713, 1720,   69,   69,   69,
+     1718,   69, 1723, 1724,   69,   69, 1726, 1727,   69,   69,
 
-     1726, 1718, 1719, 1723, 1721,   69, 1730,   69,   69, 1725,
-     1727,   69, 1732,   69, 1731,   69,   69, 1738,   69,   69,
-       69,   69, 1735, 1739, 1740, 1742,   69,   69, 1733,   69,
-       69, 1743,   69,   69,   69, 1736, 1737, 1734, 1744, 1741,
-       69, 1749, 1746, 1750,   69, 1745, 1747,   69,   69,   69,
-       69, 1754,   69, 1748, 1753,   69, 1751, 1755, 1752,   69,
-     1756,   69, 1757, 1759,   69, 1758, 1762,   69, 1760,   69,
-     1766,   69, 1761,   69, 1764,   69,   69, 1768,   69,   69,
-       69, 1771,   69,   69,   69,   69,   69,   69, 1763, 1773,
-       69, 1765,   69, 1774,   69, 1770, 1772,   69, 1769, 1778,
+       69, 1721, 1728, 1722, 1729,   69, 1730,   69,   69, 1725,
+     1731,   69, 1734, 1735,   69,   69, 1737,   69, 1732, 1736,
+     1738,   69, 1733,   69,   69,   69, 1741,   69,   69,   69,
+     1740,   69, 1742, 1745,   69,   69, 1749,   69,   69,   69,
+       69,   69, 1743, 1744,   69, 1753, 1739, 1746, 1751, 1748,
+       69, 1754,   69, 1755, 1747,   69,   69, 1750, 1752,   69,
+       69, 1757,   69,   69, 1763,   69,   69, 1759,   69, 1760,
+       69, 1756,   69, 1764, 1766,   69,   69, 1767,   69, 1758,
+     1769,   69, 1761, 1762, 1765,   69, 1768, 1771, 1773, 1770,
+       69, 1772, 1774,   69,   69,   69,   69,   69,   69, 1781,
 
-     1777, 1767, 1775, 1780,   69,   69, 1776, 1782,   69, 1783,
-       69,   69,   69, 1785,   69,   69, 1779, 1784,   69, 1789,
-     1787,   69,   69,   69, 1781, 1792,   69, 1793,   69,   69,
-       69, 1786, 1797,   69, 1788, 1790,   69,   69, 1799, 1798,
-       69, 1795, 1794,   69, 1791,   69,   69,   69, 1802, 1805,
-     1796, 1803, 1800,   69,   69, 1808,   69, 1809,   69,   69,
-     1811,   69,   69, 1801,   69,   69, 1804, 1812, 1968, 1814,
-     1806, 1807, 1815,   69, 1816,   69, 1817,   69, 1810, 1813,
-       69, 1819,   69,   69, 1820, 1818, 1821,   69,   69,   69,
-       69, 1825,   69,   69,   69,   69, 1828,   69, 1826, 1824,
+       69, 1996,   69, 1775, 1776, 1777, 1778, 1780,   69, 1782,
+       69, 1784,   69, 1783, 1785, 1786,   69,   69, 1789,   69,
+       69, 1787, 1779,   69,   69, 1791, 1793,   69, 1795,   69,
+       69,   69,   69, 1798,   69,   69,   69, 1788,   69,   69,
+     1790,   69, 1792, 1800,   69, 1801,   69, 1797, 1799, 1796,
+       69, 1805, 1794,   69, 1802, 1807,   69,   69, 1804,   69,
+     1803, 1809,   69, 1810,   69, 1811,   69,   69,   69,   69,
+     1806,   69, 1808, 1812, 1813,   69,   69, 1814,   69, 1817,
+     1820,   69, 1815, 1818, 1821,   69, 1816,   69,   69, 1825,
+       69,   69,   69, 1819, 1826, 1822,   69, 1827,   69, 1823,
 
-       69,   69, 1822, 1827,   69, 1829,   69,   69,   69, 1823,
-       69, 1832,   69,   69, 1830, 1834, 1833,   69,   69,   69,
-       69, 1831, 1869, 1840, 1842,   69, 1835,   69, 1836, 1853,
-     1837, 1838, 1843,   69, 1845,   69,   69,   69, 1839, 1841,
-     1844, 1846, 1847,   69,   69, 1848, 1850,   69,   69,   69,
-       69, 1854, 1855,   69, 1856,   69,   69,   69, 1849,   69,
-       69, 1857, 1968, 1851,   69,   69,   69, 1852, 1874, 1861,
-     1862, 1864,   69,   69, 1859, 1865,   69, 1866,   69,   69,
-       69, 1860, 1858, 1868,   69, 1863,   69, 1870, 1867, 1872,
-       69,   69,   69,   69, 1873, 1871,   69,   69, 1876,   69,
+       69,   69,   69, 1830, 1828, 1833, 1831,   69, 1824,   69,
+       69, 1836,   69, 1837,   69, 1839,   69,   69, 1829,   69,
+       69, 1832, 1840, 1901, 1834, 1835,   69,   69, 1838, 1843,
+       69, 1842, 1846, 1841, 1844,   69, 1845,   69, 1847,   69,
+       69, 1848, 1849,   69,   69,   69,   69, 1853,   69,   69,
+       69,   69, 1856,   69, 1854, 1852,   69,   69, 1850, 1855,
+       69, 1857,   69,   69,   69, 1851,   69, 1860,   69,   69,
+     1858, 1862, 1861,   69,   69,   69,   69, 1859, 1897, 1868,
+     1870,   69, 1863,   69, 1864, 1881, 1865, 1866, 1871,   69,
+     1873,   69,   69,   69, 1867, 1869, 1872, 1874, 1875,   69,
 
-       69,   69,   69, 1880,   69, 1881, 1875,   69,   69,   69,
-       69,   69,   69, 1879,   69, 1877,   69, 1878, 1883, 1884,
-     1885,   69, 1882, 1892,   69,   69, 1888,   69, 1886, 1887,
-     1893, 1890, 1894,   69, 1891, 1895,   69, 1889,   69,   69,
-     1900,   69, 1899, 1896, 1897,   69, 1902,   69,   69,   69,
-     1898, 1905, 1906,   69,   69, 1901,   69,   69,   69,   69,
-       69,   69,   69, 1903,   69,   69,   69, 1907, 1904,   69,
-     1915, 1908, 1968, 1909, 1910, 1912,   69, 1913, 1911,   69,
-     1914, 1916,   69, 1918, 1919, 1917,   69,   69, 1922, 1923,
-       69, 1920, 1921,   69,   69, 1924,   69, 1925,   69, 1928,
+       69, 1876, 1878,   69,   69,   69,   69, 1882, 1883,   69,
+     1884,   69,   69,   69, 1877,   69,   69, 1885, 1996, 1879,
+       69,   69,   69, 1880, 1902, 1889, 1890, 1892,   69,   69,
+     1887, 1893,   69, 1894,   69,   69,   69, 1888, 1886, 1896,
+       69, 1891,   69, 1898, 1895, 1900,   69,   69,   69,   69,
+       69, 1899,   69, 1904,   69,   69,   69, 1908,   69, 1909,
+       69, 1903,   69,   69,   69,   69, 1907,   69, 1905,   69,
+     1906, 1912, 1911,   69, 1996, 1913, 1910, 1920,   69,   69,
+     1916,   69, 1914, 1915, 1918, 1922,   69,   69, 1921, 1923,
+       69,   69, 1917, 1919,   69, 1928, 1924,   69,   69, 1925,
 
-       69,   69,   69,   69,   69,   69,   69, 1931,   69,   69,
-     1935, 1936, 1926,   69, 1930,   69, 1938, 1927,   69, 1929,
-       69, 1934, 1932, 1940, 1933,   69, 1939, 1941,   69, 1943,
-       69,   69, 1937,   69,   69,   69,   69,   69, 1944,   69,
-     1945, 1947, 1949,   69, 1950,   69,   69, 1942,   69, 1953,
-       69,   69, 1956, 1946, 1948, 1957,   69, 1959,   69,   69,
-     1960,   69, 1951,   69, 1952, 1954, 1958,   69,   69, 1955,
-     1961,   69, 1962, 1963,   69, 1966,   69, 1967,   69, 1968,
-     1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
-     1964, 1968, 1968, 1965,   41,   41,   41,   41,   41,   41,
+       69,   69, 1927, 1930,   69, 1933, 1926, 1934,   69,   69,
+       69, 1929,   69, 1931,   69,   69,   69,   69,   69,   69,
+     1932,   69, 1935,   69,   69, 1946, 1943, 1936, 1937, 1938,
+     1940, 1941,   69,   69,   69, 1939,   69, 1944, 1942, 1947,
+       69, 1948, 1945, 1951,   69, 1949, 1952,   69,   69,   69,
+       69, 1953, 1950, 1956,   69,   69,   69,   69,   69,   69,
+     1959,   69,   69, 1963,   69,   69,   69,   69, 1954, 1955,
+     1958, 1964, 1968, 1957, 1962, 1960,   69, 1966, 1961,   69,
+     1967,   69,   69, 1965, 1970, 1971,   69,   69, 1969, 1972,
+       69,   69,   69,   69, 1973,   69, 1975,   69, 1977,   69,
 
-       41,   46,   46,   46,   46,   46,   46,   46,   51,   51,
-       51,   51,   51,   51,   51,   57,   57,   57,   57,   57,
-       57,   57,   62,   62,   62,   62,   62,   62,   62,   72,
-       72, 1968,   72,   72,   72,   72,  129,  129, 1968, 1968,
-     1968,  129,  129,  131,  131, 1968, 1968,  131, 1968,  131,
-      133, 1968, 1968, 1968, 1968, 1968,  133,  136,  136, 1968,
-     1968, 1968,  136,  136,  138, 1968, 1968, 1968, 1968, 1968,
-      138,  140,  140, 1968,  140,  140,  140,  140,   73,   73,
-     1968,   73,   73,   73,   73,   13, 1968, 1968, 1968, 1968,
-     1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
+     1978,   69, 1981,   69,   69,   69, 1984, 1985,   69, 1974,
+       69, 1976, 1987,   69, 1988,   69, 1979, 1986, 1980,   69,
+       69,   69, 1982, 1983,   69, 1990, 1989,   69, 1996, 1991,
+     1994,   69, 1995,   69, 1996, 1996, 1996, 1996, 1996, 1996,
+     1992, 1996, 1996, 1996, 1996, 1996, 1993,   41,   41,   41,
+       41,   41,   41,   41,   46,   46,   46,   46,   46,   46,
+       46,   51,   51,   51,   51,   51,   51,   51,   57,   57,
+       57,   57,   57,   57,   57,   62,   62,   62,   62,   62,
+       62,   62,   72,   72, 1996,   72,   72,   72,   72,  129,
+      129, 1996, 1996, 1996,  129,  129,  131,  131, 1996, 1996,
 
-     1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
-     1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
-     1968, 1968, 1968, 1968, 1968
+      131, 1996,  131,  133, 1996, 1996, 1996, 1996, 1996,  133,
+      136,  136, 1996, 1996, 1996,  136,  136,  138, 1996, 1996,
+     1996, 1996, 1996,  138,  140,  140, 1996,  140,  140,  140,
+      140,   73,   73, 1996,   73,   73,   73,   73,   13, 1996,
+     1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996,
+     1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996,
+     1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996,
+     1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996
     } ;
 
-static yyconst flex_int16_t yy_chk[3926] =
+static yyconst flex_int16_t yy_chk[3979] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1538,7 +1553,7 @@ static yyconst flex_int16_t yy_chk[3926] =
         9,  161,   33,    6,    7,    7,    7,    7,    9,    7,
        10,   10,   10,   45,   45,    7,    8,    8,    8,    8,
        10,    8,   21,   33,  161,   21,   21,    8,   11,   11,
-       11,   11,   11,   11, 1974,   20,   29,   20,   20,   11,
+       11,   11,   11,   11, 2002,   20,   29,   20,   20,   11,
 
        20,   29,   24,   21,   75,   20,   24,   75,   11,   12,
        12,   12,   12,   12,   12,   83,   22,   22,   26,   26,
@@ -1549,7 +1564,7 @@ static yyconst flex_int16_t yy_chk[3926] =
        32,   32,   35,  103,   37,   32,   67,   31,   70,   37,
        36,   36,   70,   31,   76,   36,   77,   31,   76,   37,
        39,   32,   34,   37,   37,   36,   78,   34,   36,   78,
-       84,   34,   38,   38,   39,   38,   77,   34,  719,   39,
+       84,   34,   38,   38,   39,   38,   77,   34,  724,   39,
 
        34,   92,   78,   40,   40,   79,   92,   34,   40,   84,
        38,   56,   40,   56,   56,   64,   56,   64,   64,   66,
@@ -1574,13 +1589,13 @@ static yyconst flex_int16_t yy_chk[3926] =
       159,  154,  157,  157,  160,  159,  162,  158,  163,  160,
 
       162,  165,  168,  163,  183,  166,  167,  168,  169,  155,
-      156,  183,  171,  169,  156,  566,  165,  166,  172,  156,
+      156,  183,  171,  169,  156,  133,  165,  166,  172,  156,
       166,  170,  170,  173,  156,  174,  174,  170,  173,  178,
-      156,  156,  171,  175,  172,  176,  177,  179,  175,  566,
+      156,  156,  171,  175,  172,  176,  177,  179,  175,  170,
       176,  170,  179,  180,  175,  177,  181,  182,  180,  184,
       178,  181,  182,  185,  186,  187,  188,  189,  190,  185,
       192,  187,  184,  191,  193,  189,  195,  194,  191,  198,
-      133,  190,  194,  196,  186,  192,  197,  199,  188,  199,
+      131,  190,  194,  196,  186,  192,  197,  199,  188,  199,
       200,  197,  202,  203,  193,  201,  208,  200,  195,  198,
       201,  196,  196,  204,  204,  203,  209,  205,  206,  210,
 
@@ -1591,376 +1606,381 @@ static yyconst flex_int16_t yy_chk[3926] =
       225,  225,  228,  226,  229,  228,  230,  231,  229,  232,
       237,  227,  231,  233,  235,  230,  234,  234,  233,  235,
       236,  238,  239,  232,  240,  236,  241,  241,  242,  243,
-      237,  242,  244,  245,  246,  248,  244,  240,  247,  238,
-      248,  249,  250,  239,  249,  254,  251,  243,  252,  253,
-      247,  245,  246,  255,  250,  251,  259,  252,  254,  256,
+      237,  242,  244,  245,  246,  246,  244,  240,  247,  238,
+      248,  249,  250,  239,  252,  250,  249,  243,  251,  253,
+      254,  245,  248,  252,  255,  261,  247,  256,  253,  260,
 
-      260,  256,  256,  251,  251,  255,  251,  257,  257,  258,
-      253,  261,  258,  259,  262,  260,  259,  263,  263,  264,
-      261,  265,  265,  262,  264,  266,  267,  268,  269,  270,
-      271,  267,  272,  273,  270,  274,  273,  272,  273,  268,
-      266,  275,  276,  279,  281,  280,  286,  277,  269,  274,
-      271,  276,  277,  278,  282,  284,  279,  275,  278,  281,
-      275,  286,  275,  283,  279,  280,  283,  287,  282,  284,
-      288,  289,  290,  291,  288,  288,  287,  131,  294,  293,
-      292,  296,  283,  285,  293,  285,  285,  295,  291,  297,
-      298,  290,  289,  300,  297,  285,  296,  285,  285,  285,
+      251,  252,  252,  257,  252,  257,  257,  255,  129,  256,
+      261,  254,  258,  258,  259,  262,  260,  259,  263,  260,
+      264,  264,  267,  265,  262,  266,  266,  263,  265,  268,
+      269,  270,  272,  271,  268,  273,  274,  267,  271,  274,
+      273,  274,  269,  275,  276,  277,  280,  282,  278,  281,
+      279,  270,  272,  278,  277,  279,  283,  275,  284,  280,
+      276,  284,  282,  276,  285,  276,  288,  280,  287,  281,
+      283,  290,  292,  328,  328,  288,  293,  284,  285,  286,
+      289,  286,  286,  287,  289,  289,  291,  292,  295,  296,
+      301,  286,  290,  286,  286,  286,  293,  294,  286,  297,
 
-      292,  294,  285,  299,  301,  298,  302,  295,  299,  303,
-      304,  307,  305,  300,  303,  310,  301,  305,  306,  306,
-      302,  306,  308,  309,  312,  311,  304,  311,  312,  310,
-      313,  307,  314,  315,  313,  316,  317,  318,  308,  309,
-      320,  321,  318,  322,  316,  317,  321,  315,  319,  320,
-      314,  324,  319,  323,  328,  324,  325,  316,  332,  323,
-      327,  325,  326,  326,  322,  327,  330,  328,  329,  329,
-      331,  330,  333,  334,  331,  335,  336,  333,  339,  332,
-      336,  338,  334,  337,  337,  343,  338,  335,  340,  340,
-      342,  342,  344,  345,  346,  347,  350,  349,  351,  339,
+      299,  298,  294,  300,  302,  291,  298,  303,  300,  296,
+      301,  295,  304,  305,  297,  299,  302,  304,  306,  307,
+      307,  303,  307,  306,  308,  309,  310,  330,  312,  305,
+      312,  311,  313,  314,  315,  316,  313,  314,  317,  318,
+      330,  309,  310,  323,  308,  311,  319,  317,  318,  316,
+      320,  319,  315,  321,  320,  325,  322,  324,  327,  325,
+      317,  322,  321,  324,  323,  326,  329,  331,  331,  332,
+      326,  329,  333,  334,  332,  335,  333,  336,  327,  337,
+      335,  338,  339,  339,  340,  338,  336,  341,  345,  340,
+      346,  337,  342,  342,  334,  344,  344,  347,  346,  348,
 
-      344,  353,  345,  352,  354,  355,  343,  347,  352,  354,
-      353,  358,  351,  355,  346,  349,  350,  349,  356,  357,
-      359,  360,  361,  356,  357,  360,  362,  363,  364,  368,
-      366,  362,  367,  358,  369,  370,  373,  361,  370,  369,
-      371,  359,  357,  363,  369,  368,  378,  364,  365,  365,
-      366,  367,  372,  372,  365,  375,  365,  374,  374,  376,
-      371,  373,  377,  379,  365,  378,  381,  365,  380,  382,
-      375,  376,  383,  380,  365,  381,  384,  377,  388,  386,
-      389,  387,  384,  386,  390,  379,  387,  383,  382,  393,
-      388,  391,  392,  392,  395,  394,  397,  390,  389,  391,
+      349,  352,  351,  353,  355,  354,  347,  357,  341,  345,
+      354,  356,  349,  355,  360,  357,  356,  353,  358,  348,
+      351,  352,  351,  358,  359,  361,  362,  363,  364,  359,
+      362,  366,  365,  364,  368,  371,  360,  369,  372,  370,
+      371,  372,  363,  373,  375,  371,  361,  359,  365,  381,
+      366,  367,  367,  377,  368,  370,  369,  367,  379,  367,
+      374,  374,  378,  373,  376,  376,  380,  367,  377,  375,
+      367,  381,  383,  379,  378,  382,  384,  367,  385,  388,
+      382,  383,  386,  388,  389,  380,  390,  391,  386,  389,
+      392,  393,  395,  385,  399,  384,  394,  394,  390,  393,
 
-      394,  393,  396,  398,  399,  396,  395,  399,  398,  400,
-      401,  397,  409,  402,  401,  401,  403,  403,  404,  404,
-      406,  406,  405,  407,  407,  400,  402,  405,  400,  408,
-      410,  411,  412,  409,  408,  410,  412,  413,  416,  414,
-      415,  417,  413,  414,  418,  415,  417,  419,  420,  418,
-      411,  420,  421,  422,  422,  423,  420,  424,  416,  426,
-      420,  419,  424,  425,  426,  427,  428,  429,  432,  428,
-      421,  429,  433,  423,  427,  430,  431,  425,  434,  435,
-      430,  431,  436,  434,  432,  433,  437,  442,  443,  439,
-      438,  437,  439,  429,  436,  435,  438,  440,  441,  444,
+      397,  396,  402,  392,  395,  391,  396,  398,  400,  399,
+      398,  401,  397,  400,  401,  403,  404,  411,  402,  403,
+      403,  402,  405,  405,  406,  406,  407,  408,  408,  404,
+      410,  407,  409,  409,  412,  410,  413,  414,  411,  412,
+      415,  414,  416,  417,  418,  415,  416,  419,  417,  420,
+      422,  421,  419,  422,  420,  413,  423,  425,  422,  424,
+      424,  426,  422,  427,  418,  421,  426,  428,  427,  430,
+      431,  429,  433,  431,  423,  425,  429,  433,  430,  432,
+      434,  428,  435,  432,  436,  434,  437,  438,  439,  440,
+      441,  437,  442,  445,  440,  442,  441,  436,  435,  443,
 
-      440,  445,  443,  441,  444,  442,  445,  446,  447,  448,
-      450,  447,  446,  449,  448,  451,  452,  449,  449,  454,
-      453,  452,  454,  450,  457,  455,  457,  456,  451,  453,
-      455,  456,  456,  458,  459,  460,  459,  454,  461,  462,
-      463,  464,  465,  467,  466,  464,  468,  469,  471,  470,
-      472,  465,  458,  460,  470,  478,  461,  475,  462,  466,
-      463,  467,  469,  473,  473,  468,  474,  471,  475,  472,
-      474,  476,  477,  479,  478,  480,  476,  482,  481,  485,
-      483,  487,  480,  481,  482,  483,  479,  484,  477,  486,
-      487,  488,  484,  489,  490,  491,  486,  485,  491,  490,
+      439,  444,  443,  438,  446,  432,  444,  447,  448,  449,
+      451,  445,  447,  448,  449,  451,  450,  452,  446,  450,
+      453,  452,  452,  454,  455,  456,  458,  457,  461,  455,
+      457,  458,  463,  453,  456,  459,  454,  464,  465,  459,
+      459,  460,  462,  460,  462,  457,  466,  461,  467,  468,
+      463,  470,  467,  469,  471,  464,  472,  465,  468,  473,
+      474,  475,  476,  476,  473,  478,  466,  479,  469,  470,
+      477,  472,  479,  471,  477,  480,  478,  481,  483,  474,
+      475,  482,  484,  485,  486,  483,  488,  484,  487,  486,
+      485,  480,  489,  487,  482,  491,  481,  490,  492,  489,
 
-      492,  493,  489,  495,  492,  488,  494,  494,  497,  498,
-      499,  500,  495,  497,  499,  494,  501,  503,  504,  502,
-      505,  511,  493,  500,  502,  503,  508,  515,  514,  498,
-      539,  516,  521,  515,  501,  516,  504,  514,  511,  517,
-      517,  508,  518,  520,  539,  505,  506,  518,  520,  522,
-      521,  506,  527,  523,  525,  506,  523,  129,  506,  524,
-      524,  525,  526,  526,  532,  506,  532,  527,  506,  519,
-      519,  519,  533,  519,  522,  529,  519,  528,  528,  530,
-      529,  519,  530,  534,  531,  535,  536,  519,  519,  531,
-      538,  533,  537,  537,  536,  540,  541,  542,  543,  543,
+      493,  496,  504,  508,  488,  493,  490,  492,  494,  491,
+      495,  494,  497,  497,  495,  498,  501,  507,  500,  503,
+      504,  497,  496,  500,  498,  502,  506,  505,  508,  502,
+      511,  503,  505,  514,  506,  507,  501,  509,  517,  519,
+      520,  520,  509,  519,   68,  511,  509,  517,  518,  509,
+      514,  524,  521,  523,  518,  525,  509,  521,  523,  509,
+      522,  522,  522,  526,  522,  536,  526,  522,  528,  524,
+      527,  527,  522,  529,  529,  528,  530,  536,  522,  522,
+      525,  531,  531,  532,  533,  534,  537,  533,  532,  538,
+      534,  530,  535,  539,  535,  540,  541,  541,  542,  544,
 
-       68,  544,  542,  534,  535,  538,  544,  545,  541,  547,
-      548,  546,  545,  540,  546,  547,  549,  550,  548,  552,
-      551,  553,  554,  554,  549,  551,  552,  555,  557,  556,
-      558,  563,  560,  557,  561,  550,  555,  556,  565,  562,
-      553,  560,  562,  561,  569,  563,  564,  564,  567,  558,
-      570,  567,  571,  565,  572,  570,  573,  574,  575,  567,
-      576,  577,  578,  579,  576,  569,  584,  575,  580,  581,
-      582,   62,  579,  571,  572,  585,  582,  574,  573,  577,
-      580,  578,  586,  581,  583,  583,  584,  586,  587,  585,
-      588,  589,  590,  587,  588,  591,  592,  593,  593,  595,
+      543,  546,   62,  540,  545,  537,  546,  547,  547,  538,
+      548,  557,  539,  542,  543,  548,  545,  544,  549,  550,
+      551,  552,  550,  549,  553,  554,  551,  556,  555,  552,
+      557,  559,  553,  555,  556,  558,  558,  560,  562,  561,
+      559,  564,  565,  554,  561,  560,  566,  567,  569,  566,
+      564,  565,  568,  568,  570,  571,  573,  562,  571,  574,
+      575,  567,  576,  569,  574,  577,  571,  579,  578,  580,
+      583,  581,  582,  580,  584,  588,  579,  573,  570,  583,
+      585,  575,  576,  589,  586,  596,  584,  577,  578,  581,
+      586,  582,  587,  587,  585,  588,  590,  589,  591,  593,
 
-      591,  594,  595,  596,  590,  597,  594,  599,  598,  603,
-      589,  601,  590,  598,  600,  600,  605,  592,  597,  602,
-      602,  596,  604,  606,  603,  607,  604,  599,  608,  601,
-      610,  610,  611,  614,  613,  605,  611,  614,  612,  607,
-      615,  616,  617,  618,   57,  622,  616,  606,  608,  609,
-      622,  624,  609,  612,  609,  615,  617,  618,  609,  613,
-      609,  620,  619,  621,  649,  609,  619,  623,  621,  625,
-      609,  626,  624,  649,  627,  631,  620,  626,  621,  627,
-      631,  623,  632,  625,  628,  628,  629,  629,  630,  633,
-      634,  634,  629,  635,  629,  636,  632,  637,  635,  638,
+      592,  590,  594,  591,  592,  595,  596,  597,  597,  599,
+      595,  598,  599,  600,  594,  601,  598,  603,  593,  602,
+      604,  604,  594,  605,  602,  606,  606,  607,  601,  608,
+      609,  600,  610,  608,  611,  612,  615,  603,  614,  614,
+      615,  605,  607,  616,  617,  640,  618,  621,  611,  609,
+      618,  622,  619,  640,  620,  612,  610,  613,  616,  620,
+      613,  621,  613,  628,  624,  622,  613,  619,  613,  617,
+      623,  625,  626,  613,  623,  627,  625,  626,  613,  624,
+      629,  630,   57,  631,  628,  634,  625,  630,  631,  627,
+      632,  632,  636,  635,  629,  633,  633,  634,  635,  637,
 
-      630,  633,  644,  636,  640,  629,  639,  639,  640,  642,
-      643,  637,  629,  643,  642,  645,  648,  646,  638,  647,
-      650,  644,  646,  651,  647,  652,  653,  654,  645,  655,
-      656,  653,  651,  657,  659,  648,  650,  658,  661,  659,
-      662,  663,  657,  655,  652,   52,  658,  654,  664,  665,
-      656,  672,  667,  664,  665,  666,  663,  661,  662,  669,
-      666,  667,  668,  668,  669,  670,  673,  672,  674,  674,
-      673,  673,  674,  675,  676,  677,  675,  678,  670,  679,
-      680,  681,  682,  680,  683,  684,  690,  685,  676,  683,
-      684,  686,  678,  685,  687,  677,  688,  688,  682,  679,
+      642,  633,  639,  633,  638,  638,  636,  639,  641,  643,
+      643,  637,  644,  646,  633,  648,  644,  647,  646,  642,
+      647,  633,  641,  649,  650,  651,  652,  655,  653,  650,
+      651,  654,  656,  657,  648,  659,  649,  653,  661,  658,
+      654,  656,  660,  655,  658,  652,  664,  666,  662,  667,
+      663,  664,  657,  668,  672,  659,  660,  662,  661,  663,
+      669,  673,  673,  672,  670,  669,  666,  667,  668,  670,
+      671,  674,  675,  677,  678,  671,  674,  681,  678,  678,
+      679,  679,  682,  680,  679,  675,  680,  684,  683,  677,
+      685,  681,  686,  685,  687,  688,  689,  694,  690,  691,
 
-      687,  689,  681,  691,  690,  692,  691,  686,  693,  694,
-      689,  695,  696,  697,  698,  700,  703,  696,  697,  698,
-      702,  704,  701,  692,  695,  701,  704,  693,  703,  694,
-      705,  702,  706,  700,  707,  705,  708,  708,  709,  707,
-      710,  711,  712,  713,  715,  716,  712,  706,  718,  714,
-      720,  721,  722,  711,  710,  723,  744,  709,  714,  744,
-      723,  713,  731,  715,  720,  727,  721,  718,  724,  725,
-      716,  726,  722,  724,  725,  728,  726,  729,  730,  727,
-      732,  731,  729,  733,  734,  735,  735,  732,  736,  728,
-      737,  738,  739,  730,  740,  740,  741,  738,  733,  742,
+      688,  689,  682,  683,  690,  692,  694,  684,  693,  693,
+      687,  692,  695,  686,  696,  691,  697,  696,  698,  699,
+      700,  701,  702,  703,  705,  707,  701,  702,  703,  706,
+      695,  708,  706,  700,  697,  709,  707,  698,  711,  699,
+      709,  710,  705,  708,  712,  714,  710,  713,  713,  712,
+      716,  715,  717,  711,  718,  720,  717,  719,  721,  723,
+      727,  725,  716,  728,  714,  715,  719,  726,  728,   52,
+      736,  729,  718,  732,  720,  725,  729,  733,  723,  730,
+      727,  731,  726,  721,  730,  734,  731,  732,  735,  736,
+      734,  733,  737,  738,  739,  740,  740,  741,  742,  737,
 
-      743,  741,  736,  734,  745,  747,  742,  746,  737,  748,
-      747,  750,  739,  749,  743,  752,  746,  753,  749,  752,
-      754,  755,  745,  756,  757,  758,  753,  759,  748,  760,
-      750,  757,  763,  761,  764,  754,  762,  758,  756,  765,
-      755,  768,  762,  770,  767,  769,  759,  763,  765,  767,
-      760,  761,  771,  769,  764,  768,  772,  771,  774,  775,
-      773,  776,  776,  770,  773,  773,  777,  778,  772,  779,
-      780,  780,  782,  775,  779,  781,  778,  774,  783,  777,
-      781,  782,  784,  783,  785,  785,  786,  784,  787,  788,
-      789,  790,  791,  787,  792,  786,  790,  791,  793,  792,
+      743,  744,  746,  735,  745,  745,  743,  746,  738,  748,
+      747,  741,  749,  739,  750,  749,  742,  747,  751,  752,
+      753,  744,  755,  748,  752,  754,  758,  751,  759,  757,
+      754,  760,  750,  757,  761,  758,  763,  762,  764,  753,
+      765,  755,  766,  759,  762,  767,  769,  768,  763,  761,
+      760,  767,  775,  772,  770,  773,  774,  764,  772,  777,
+      766,  765,  768,  770,  774,  776,  769,  779,  780,  773,
+      776,  777,  775,  778,  781,  782,  782,  778,  778,  783,
+      784,  993,  780,  785,  786,  786,  779,  781,  785,  784,
+      787,  788,  783,  789,  790,  787,  791,  791,  789,  790,
 
-      795,  795,  793,  788,  796,  797,  796,  799,  789,  794,
-      802,  799,  801,  800,  805,   51,  797,  803,  794,  802,
-      804,  803,  803,  794,  806,  794,  807,  794,  800,  794,
-      801,  809,  806,  805,  804,  808,  810,  811,  811,  812,
-      807,  813,  813,  815,  808,  816,  815,  817,  819,  809,
-      816,  818,  818,  821,  812,  820,  820,  822,  821,  823,
-      823,  810,  824,  826,  825,  827,  817,  829,  819,  825,
-      827,  826,  828,  828,  830,  832,  831,  839,  822,  834,
-      830,  835,  824,  831,  834,  829,  835,  836,  832,  837,
-      838,  840,  836,  842,  837,  843,  839,  841,  841,  838,
+      788,  792,  793,  794,  795,  993,  796,  793,  797,  798,
+      792,  796,  799,  797,  798,  806,  799,  794,  801,  801,
+      803,  805,  795,  800,  802,  805,  802,  807,  812,  808,
+      806,  803,  800,  811,  810,  813,  812,  800,  808,  800,
+      815,  800,  809,  800,  814,  807,  809,  809,  810,  813,
+      816,  818,  811,  814,  817,  817,  819,  819,  815,  821,
+      822,  823,  821,  824,  824,  822,  818,  825,  826,  826,
+      828,  827,  829,  829,  830,  816,  827,  831,  832,  833,
+      823,  835,  831,   51,  833,  837,  832,  825,  834,  834,
+      836,  828,  837,  838,  830,  840,  836,  841,  842,  835,
 
-      844,  845,  840,  849,  846,  847,  845,  848,  850,  850,
-      851,  852,  854,  842,  853,  843,  856,  854,  846,  848,
-      861,  849,  859,  844,  846,  847,  855,  855,  857,  861,
-      851,  868,  853,  857,  864,  865,  852,  862,  860,  856,
-      865,  859,  860,  860,  863,  862,  863,  866,  864,  867,
-      868,  866,  869,  870,  871,  872,  873,  874,  876,  871,
-      867,  874,  875,  877,  881,  878,  879,  880,  885,  882,
-       46,  870,  889,  872,  882,  877,  873,  876,  869,  878,
-      875,  879,  880,  881,  883,  884,  885,  886,  887,  888,
-      884,  883,  890,  889,  891,  888,  886,  890,  898,  891,
+      840,  844,  841,  842,  843,  845,  838,  846,  848,  843,
+      844,  847,  847,  849,  850,  851,  852,  854,  846,  853,
+      851,  857,  855,  858,  845,  856,  856,  859,  848,  854,
+      852,  861,  861,  849,  862,  865,  852,  850,  860,  853,
+      855,  857,  863,  860,  867,  859,  866,  863,  858,  870,
+      866,  866,  868,  867,  865,  873,  869,  862,  869,  871,
+      868,  872,  874,  870,  871,  872,  873,  875,  876,  877,
+      878,  879,  880,  882,  877,  883,  880,  881,  899,  899,
+      884,  874,  885,  886,  887,  888,  876,  883,  878,  889,
+      888,  879,  882,  875,  884,  881,  889,  885,  886,  890,
 
-      892,  893,  893,  887,  900,  892,  894,  894,  896,  896,
-      897,  901,  899,  904,  897,  902,  898,  899,  900,  902,
-      902,  903,  905,  906,  907,  903,  903,  908,  909,  910,
-      901,  911,  912,  904,  916,  910,  911,  913,  914,  915,
-      917,  905,  906,  907,  918,  919,  919,  909,  916,  920,
-      921,  912,  920,  908,  922,  922,  913,  914,  915,  918,
-      923,  917,  921,  924,  925,  923,  926,  924,  927,  934,
-      928,  930,  928,  931,  931,  926,  928,  925,  932,  935,
-      933,  927,  938,  932,  933,  936,  952,  934,  940,  928,
-      936,  930,  942,  940,  941,  941,  947,  942,  951,  935,
+      891,  892,  893,  887,  890,  894,  895,  896,  897,  898,
+      892,  894,  896,  897,  898,  900,  900,  893,  891,  902,
+      902,  903,  904,  905,  906,  903,  907,  895,  908,  906,
+      909,  904,  910,  911,  909,  909,  910,  910,  912,  913,
+      907,  905,  914,  915,  916,  917,  919,  908,  920,  918,
+      923,  917,  921,  911,  918,  922,  924,  912,  913,  927,
+      925,  914,  927,  916,  923,  919,  928,  920,   46,  915,
+      932,  921,  926,  926,  922,  925,  930,  924,  928,  929,
+      929,  930,  931,  932,  933,  934,  931,  941,  935,  937,
+      935,  938,  938,  933,  935,  939,  942,  940,  934,  943,
 
-      938,  944,  944,  946,  946,  949,  950,  950,  949,  953,
-      954,  952,  947,  951,  955,  954,  956,  956,  957,  958,
-      959,  959,  957,  953,  960,  961,  962,  964,  963,  955,
-      962,  967,  964,  966,  966,  971,  961,  968,  970,  958,
-      969,  969,  972,  970,  973,  974,  960,  963,  975,  967,
-      975,  968,  976,  973,  977,  971,  978,  976,  979,  977,
-      981,  983,  972,  979,  984,  974,  982,  982,  986,  988,
-      984,  987,  987,  989,  981,  995,  978,  993,  991,  990,
-      983,  988,  990,  991,  992,  990,  993,  999,  996,  992,
-      994,  996,  986,  989,  997,  994, 1000,  990, 1001,  997,
+      939,  940,  945,  947,  943,  941,  954,  935,  947,  937,
+      948,  948,  949,  951,  951,  958,  942,  949,  953,  953,
+      945,  956,  954,  959,  956,  957,  957,  960,  961,  962,
+      958,  963,  963,  961,  964,  965,  966,  966,  964,  967,
+      968,  960,  969,  970,  962,  971,  969,  974,  959,  975,
+      971,  968,  973,  973,  977,  965,  976,  976,  978,  977,
+      979,  967,  970,  975,  980,  974,  981,  982,  985,  982,
+      983,  984,  986,  980,  996,  983,  984,  986,  978,  988,
+      979,  989,  989,  990,  991,  995,  981, 1000,  985, 1002,
+      991,  994,  994,  988,  996,  997, 1000,  995,  997,  998,
 
-      995,  998,  998, 1002, 1003,  999, 1004, 1005, 1002, 1003,
-     1009, 1004, 1006, 1007, 1007, 1000, 1008, 1006, 1001, 1010,
-     1011, 1008, 1012, 1013, 1014, 1016, 1015, 1017, 1009, 1018,
-     1005, 1015, 1019, 1021, 1021, 1013, 1012, 1014, 1026, 1010,
-     1011, 1022, 1023, 1018, 1024, 1016, 1022, 1017, 1028, 1025,
-     1030, 1024, 1037, 1019, 1026, 1031, 1031, 1023, 1025, 1032,
-     1032, 1025, 1033, 1028, 1034, 1033, 1035, 1036, 1028, 1034,
-     1039, 1037, 1038, 1040, 1042, 1030, 1036, 1043, 1040, 1039,
-     1044, 1038, 1035, 1045, 1038, 1041, 1041, 1046, 1047, 1049,
-     1043, 1050, 1051, 1051, 1042, 1052, 1053, 1045, 1044, 1054,
+      999,  997,  990, 1001,  998,  999, 1003, 1004, 1001, 1003,
+     1005, 1005, 1004,  997, 1002, 1006, 1007, 1008, 1009, 1010,
+     1011, 1012, 1013, 1009, 1010, 1011, 1015, 1013, 1014, 1014,
+     1016, 1015, 1017, 1006, 1018, 1007, 1019, 1008, 1022, 1020,
+     1021, 1023, 1024, 1022, 1012, 1025, 1026,   41, 1016, 1029,
+     1019, 1020, 1017, 1021, 1018, 1028, 1028, 1031, 1030, 1025,
+     1034, 1023, 1024, 1030, 1032, 1033, 1036, 1026, 1038, 1029,
+     1041, 1032, 1031, 1041, 1033, 1042, 1034, 1033, 1039, 1039,
+     1042, 1036, 1040, 1040, 1043, 1044, 1036, 1045, 1047, 1046,
+     1048, 1049, 1049, 1038, 1044, 1048, 1050, 1047, 1046, 1051,
 
-     1047, 1055, 1055, 1046, 1054, 1053, 1056, 1057, 1059, 1050,
-     1060, 1052, 1061, 1059, 1049, 1056, 1055, 1061, 1056, 1062,
-     1063, 1064, 1065, 1066, 1062, 1057, 1063, 1065, 1060, 1067,
-     1070, 1071, 1067, 1072, 1073, 1074, 1066, 1075, 1067, 1071,
-     1076, 1064, 1075, 1077, 1079, 1079, 1072, 1080, 1082, 1070,
-     1085, 1081, 1073, 1082, 1074, 1081, 1076, 1083, 1084, 1085,
-     1086, 1077, 1083, 1084, 1088, 1089, 1089, 1080, 1090, 1091,
-     1094, 1156, 1092, 1093, 1096, 1095, 1091, 1097, 1156, 1088,
-     1095, 1098, 1090, 1086, 1092, 1093, 1096, 1098, 1106, 1094,
-     1099, 1099, 1104, 1100, 1103, 1097, 1100, 1101, 1101, 1103,
+     1043, 1046, 1052, 1053, 1057, 1054, 1045, 1055, 1058, 1059,
+     1059, 1060, 1051, 1061, 1065, 1068, 1050, 1053, 1062, 1055,
+     1052, 1054, 1061, 1062, 1063, 1063, 1058, 1060, 1064, 1057,
+     1067, 1069, 1065, 1068, 1072, 1067, 1069, 1064, 1070, 1063,
+     1064, 1071, 1074, 1070, 1073, 1078, 1080, 1071, 1075, 1073,
+     1079, 1075, 1081, 1082, 1072, 1074, 1083, 1075, 1079, 1080,
+     1084, 1083, 1085, 1088, 1078, 1087, 1087, 1089, 1090, 1091,
+     1081, 1089, 1082, 1090, 1091, 1093, 1084, 1092, 1094, 1096,
+     1085, 1098, 1092, 1088, 1093, 1097, 1097, 1100, 1101, 1099,
+     1102, 1104, 1103, 1105, 1096, 1098, 1099, 1103, 1106, 1100,
 
-     1106, 1104, 1105, 1105, 1107, 1108, 1109, 1110, 1111, 1107,
-     1112, 1113, 1114, 1111, 1108, 1115, 1115, 1117, 1109, 1112,
-     1116, 1118, 1110, 1119, 1121, 1116, 1123, 1114, 1120, 1120,
-     1130, 1113, 1112, 1122, 1122, 1124, 1124, 1125, 1117, 1127,
-     1118, 1125, 1127, 1119, 1121, 1126, 1129, 1123, 1130, 1131,
-     1126, 1129, 1132, 1136, 1131, 1133, 1133, 1134, 1134, 1135,
-     1137, 1138, 1140, 1139, 1135, 1136, 1136, 1136, 1139, 1142,
-     1143, 1145, 1136, 1144, 1144, 1146, 1146, 1132, 1147, 1148,
-     1137, 1138, 1140, 1142, 1149, 1149, 1150, 1150, 1154, 1154,
-     1153, 1143, 1155, 1157, 1158, 1159, 1159, 1145, 1147, 1153,
+     1101, 1094,   14, 1104, 1106, 1107, 1107, 1108, 1112, 1102,
+     1108, 1105, 1109, 1109, 1111, 1113, 1113, 1112, 1114, 1111,
+     1115, 1117, 1116, 1118, 1119, 1115, 1120, 1121, 1122, 1119,
+     1114, 1116, 1125, 1117, 1124, 1120, 1123, 1123, 1118, 1124,
+     1126, 1127, 1129, 1122, 1128, 1128, 1131, 1121, 1120, 1130,
+     1130, 1132, 1132, 1125, 1133, 1134, 1138, 1140, 1133, 1126,
+     1134, 1127, 1129, 1135, 1137, 1139, 1135, 1131, 1143, 1137,
+     1139, 1141, 1141, 1143, 1138, 1142, 1142, 1144, 1145, 1146,
+     1147, 1148, 1140, 1150, 1152, 1147, 1151, 1150, 1150, 1144,
+     1144, 1144, 1153, 1153, 1154, 1156, 1144, 1157, 1145, 1146,
 
-     1160, 1148, 1157, 1161, 1163, 1164, 1166, 1155, 1165, 1163,
-     1164, 1167, 1168, 1166, 1169, 1169, 1167, 1168, 1170, 1161,
-     1158, 1171, 1172, 1170, 1173, 1174, 1160, 1176, 1165, 1175,
-     1171, 1177, 1175, 1178, 1178, 1179, 1180, 1174, 1181, 1184,
-     1182, 1183, 1172, 1173, 1182, 1176, 1188, 1183, 1184, 1186,
-     1179, 1185, 1185, 1181, 1189, 1180, 1190, 1177, 1187, 1187,
-     1186, 1191, 1192, 1192, 1195, 1186, 1191, 1188, 1189, 1193,
-     1194, 1196, 1197, 1193, 1193, 1194, 1190, 1197, 1200, 1199,
-     1201, 1202, 1200, 1196, 1203, 1204, 1206,   41, 1205, 1203,
-     1195, 1199, 1201, 1205, 1208, 1209, 1209, 1208, 1206, 1210,
+     1151, 1148, 1155, 1155, 1162, 1152, 1158, 1158, 1159, 1159,
+     1163, 1163, 1164, 1162, 1165, 1156, 1166, 1167, 1169, 1157,
+     1154, 1165, 1168, 1168, 1170, 1166, 1172, 1164, 1173, 1174,
+     1175, 1172, 1181, 1173, 1176, 1182, 1177, 1175, 1183, 1176,
+     1170, 1177, 1179, 1167, 1169, 1178, 1178, 1179, 1180, 1174,
+     1183, 1185, 1181, 1184, 1182, 1186, 1184, 1180, 1187, 1187,
+     1188, 1189, 1190, 1191, 1192, 1193, 1197, 1191, 1195, 1185,
+     1192, 1194, 1194, 1199, 1193, 1188, 1198, 1190, 1204, 1195,
+     1189, 1186, 1196, 1196, 1195, 1211, 1200, 1197, 1201, 1201,
+     1198, 1200, 1202, 1199, 1203, 1205, 1202, 1202, 1206, 1203,
 
-     1210, 1211, 1211, 1212, 1213, 1215, 1202, 1204, 1214, 1216,
-     1213, 1215, 1218, 1214, 1221, 1223, 1220, 1218, 1216, 1220,
-     1224, 1224, 1225, 1212, 1226, 1227, 1221, 1223, 1228,   14,
-     1229, 1230, 1231, 1226, 1229, 1232, 1230, 1231, 1234, 1234,
-     1235, 1241, 1225, 1227, 1236, 1237, 1243, 1228, 1244, 1232,
-     1234, 1239, 1239, 1236, 1237, 1245, 1246, 1241, 1235, 1251,
-     1245, 1243, 1244, 1247, 1247, 1248, 1251, 1248, 1249, 1249,
-     1252, 1253, 1253, 1246, 1254, 1255, 1256, 1257, 1259, 1258,
-     1260, 1261, 1262, 1254, 1265, 1266, 1265, 1264, 1256, 1257,
-     1252, 1258, 1264, 1267, 1272, 1260, 1255, 1274, 1267, 1268,
+     1208, 1209, 1210, 1206, 1204, 1209, 1212, 1205, 1213, 1215,
+     1211, 1212, 1208, 1214, 1210, 1221, 1217,   13, 1214, 1217,
+     1225, 1215, 1218, 1218, 1219, 1219, 1220, 1220, 1222, 1225,
+     1213, 1223, 1224, 1230, 1222, 1221, 1223, 1227, 1224, 1232,
+     1229, 1234, 1227, 1229, 1235, 1230, 1233, 1233, 1236, 1237,
+     1238, 1232, 1239, 1235, 1238, 1240, 1241, 1239, 1244, 1250,
+     1240, 1234, 1243, 1243, 1245, 1252, 1236, 1253, 1237, 1246,
+     1241, 1248, 1248, 1245, 1243, 1250, 1244, 1254, 1246, 1255,
+     1252, 1253, 1254, 1256, 1256, 1257, 1260, 1257, 1258, 1258,
+     1261, 1262, 1262, 1260, 1263, 1264, 1255, 1265, 1268, 1266,
 
-     1270, 1261, 1262, 1266, 1259, 1280, 1268, 1275, 1272, 1270,
-     1273, 1273, 1275, 1276, 1277, 1276, 1278, 1279, 1283, 1277,
-     1284, 1278, 1281, 1274, 1282, 1280, 1286, 1281, 1284, 1282,
-     1287, 1283, 1288, 1288, 1290, 1279, 1289, 1289, 1291, 1295,
-       13, 1292, 1293, 1296, 1287, 1286, 1292, 1293, 1294, 1290,
-     1294, 1295, 1296, 1299, 1297, 1296, 1297, 1300, 1291, 1298,
-     1298, 1302, 1299, 1303, 1305, 1306, 1302, 1308, 1303, 1300,
-     1307, 1313, 1310, 1312, 1314, 1315, 1319, 1305, 1310, 1312,
-     1316, 1316, 1317, 1308, 1315, 1306, 1313, 1322, 1307, 1318,
-     1318, 1317, 1320, 1321, 1325, 1319, 1320, 1323, 1321, 1314,
+     1267, 1270, 1269, 1263, 1277, 1272, 1273, 1270, 1275, 1265,
+     1261, 1266, 1267, 1275, 1285, 1283, 1264, 1269, 1278, 1276,
+     1270, 1276, 1277, 1278, 1268, 1272, 1273, 1279, 1281, 1283,
+     1284, 1284, 1290, 1286, 1279, 1291,    0, 1281, 1286, 1287,
+     1285, 1287, 1288, 1289, 1292, 1294, 1293, 1288, 1289, 1292,
+     1290, 1293, 1295, 1297, 1298, 1291, 1299, 1299, 1294, 1301,
+     1295, 1300, 1300, 1302, 1303, 1304, 1306, 1307, 1298, 1303,
+     1304, 1305, 1297, 1305, 1301, 1308, 1307, 1308, 1306, 1307,
+     1309, 1309, 1310, 1302, 1311, 1313, 1316, 1314, 1317, 1318,
+     1313, 1310, 1314, 1319, 1321, 1323, 1311, 1324, 1325, 1316,
 
-     1322, 1323, 1323, 1324, 1328, 1328, 1329, 1330, 1330, 1331,
-     1331, 1324, 1332, 1333, 1325, 1329, 1334, 1335, 1336, 1336,
-     1338, 1334, 1335, 1339, 1332, 1340, 1341, 1342, 1339, 1343,
-     1344, 1333, 1342, 1345, 1345, 1346, 1347, 1348, 1349, 1346,
-     1350, 1341, 1348, 1352, 1353, 1338, 1344, 1343, 1340, 1354,
-     1355, 1347, 1362, 1356, 1357, 1358, 1360, 1360, 1361, 1350,
-     1368, 1361, 1352, 1363, 1349, 1362, 1357, 1353, 1364, 1355,
-     1365, 1365, 1369, 1354, 1356, 1368, 1358, 1363, 1366, 1366,
-     1373, 1364, 1367, 1367, 1375, 1369, 1370, 1370, 1371, 1371,
-     1372, 1372, 1374, 1374, 1376, 1376, 1377, 1377, 1378, 1373,
+     1321, 1323, 1326, 1327, 1327, 1328, 1330, 1318, 1317, 1319,
+     1336, 1326, 1324, 1331, 1328, 1329, 1329, 1331, 1333, 1332,
+     1335,    0, 1334, 1325, 1332, 1330, 1334, 1334, 1335, 1340,
+     1336, 1333, 1339, 1339, 1341, 1341, 1342, 1342, 1340, 1343,
+     1344, 1345, 1346, 1347, 1347, 1349, 1345, 1346, 1350, 1351,
+     1352, 1343, 1353, 1350, 1358, 1354, 1360, 1353, 1344, 1355,
+     1356, 1356, 1357, 1359, 1361, 1352, 1357, 1363, 1359, 1358,
+     1349, 1364, 1351, 1354, 1365, 1355, 1366, 1368, 1367, 1369,
+     1371, 1371, 1360, 1361, 1372, 1398, 1363, 1372, 1373, 1368,
+     1374, 1398, 1375, 1379, 1364, 1366, 1376, 1376, 1365, 1367,
 
-     1380, 1382, 1375, 1381, 1381, 1380, 1383, 1383, 1384, 1385,
-     1386, 1387, 1387, 1386, 1389, 1385, 1390, 1378, 1388, 1388,
-     1382, 1391, 1392, 1392, 1394, 1395, 1384, 1387, 1396, 1401,
-     1397, 1390, 1399, 1389, 1397, 1398, 1398, 1400, 1400, 1407,
-     1391, 1402, 1402, 1396, 1394, 1403, 1405, 1406, 1395, 1408,
-     1409, 1399, 1406, 1412, 1403, 1401, 1410, 1413, 1405, 1415,
-     1411, 1410, 1408, 1414, 1407, 1411, 1413, 1419, 1412, 1416,
-     1425, 1409, 1414, 1415, 1416, 1417, 1421, 1422, 1422, 1417,
-     1427, 1423, 1424, 1424, 1428, 1421, 1423, 1419, 1430, 1434,
-     1425, 1424, 1425, 1428, 1432, 1427, 1433, 1432, 1435, 1439,
+     1369, 1373, 1377, 1377, 1374, 1375, 1378, 1378, 1379, 1380,
+     1381, 1381, 1382, 1383, 1383, 1384, 1384, 1385, 1385, 1386,
+     1391, 1382, 1380, 1388, 1382, 1387, 1387, 1389, 1389, 1390,
+     1390, 1393, 1394, 1394, 1395, 1402, 1393, 1397, 1386, 1391,
+     1404, 1388, 1396, 1396, 1399, 1400, 1400, 1399, 1401, 1401,
+     1403, 1405, 1405, 1395, 1402, 1397, 1407, 1408, 1409, 1404,
+     1410, 1400, 1411, 1411, 1410, 1403, 1412, 1413, 1413, 1414,
+     1415, 1415, 1416, 1409, 1418, 1420, 1407, 1419, 1421, 1423,
+     1408, 1416, 1419, 1422, 1423, 1412, 1418, 1424, 1425, 1426,
+     1427, 1421, 1424, 1428, 1432, 1414, 1429,    0, 1426, 1427,
 
-     1430, 1433, 1436, 1436, 1438, 1438, 1440, 1440, 1441, 1434,
-     1435, 1442, 1443, 1439, 1444, 1444, 1447, 1446, 1450, 1447,
-     1441, 1446, 1448, 1448, 1449, 1442, 1451, 1452, 1453, 1449,
-     1454, 1443, 1453, 1459, 1455, 1456, 1457, 1462, 1450, 1455,
-     1456, 1452, 1457, 1460, 1466, 1462, 1451, 1461, 1460, 1459,
-     1454, 1463, 1461, 1463, 1467, 1467, 1471, 1471, 1466, 1473,
-     1476, 1477, 1477, 1479, 1479, 1476, 1481, 1482, 1482, 1483,
-     1484, 1481, 1487, 1485, 1488, 1489, 1489, 1473, 1485, 1491,
-     1493, 1494, 1492, 1496, 1496, 1483, 1488, 1492, 1491, 1498,
-     1500, 1487, 1484, 1499, 1498, 1499, 1494, 1501, 1493, 1502,
+     1420, 1429, 1430, 1425, 1422, 1438, 1430, 1428, 1434, 1435,
+     1435, 1436, 1437, 1437, 1432, 1440, 1436, 1434, 1447, 1441,
+     1443, 1437, 1448, 1445, 1446, 1438, 1445, 1438, 1441, 1446,
+     1440, 1452, 1443, 1455, 1448, 1449, 1449, 1454, 1447, 1451,
+     1451, 1453, 1453, 1456, 1459, 1452, 1463, 1455, 1459, 1454,
+     1457, 1457, 1460, 1461, 1461, 1460, 1462, 1464, 1465, 1466,
+     1467, 1462, 1456, 1466, 1468, 1469, 1463, 1470, 1472, 1468,
+     1469, 1473, 1465, 1470, 1474, 1475, 1473, 1464, 1479, 1474,
+     1467, 1480, 1480, 1475, 1472, 1476, 1481, 1476, 1482, 1481,
+     1483, 1483, 1479, 1487, 1487, 1489, 1492, 1493, 1493, 1495,
 
-     1502, 1505, 1501, 1506, 1500, 1503, 1503, 1504, 1504, 1507,
-     1507, 1508, 1509, 1505, 1510, 1511, 1512, 1513, 1513, 1514,
-     1511, 1506, 1515, 1508, 1509, 1516, 1510, 1517, 1514, 1518,
-     1519, 1520, 1520, 1521, 1522, 1523, 1512,    0, 1524, 1533,
-     1517, 1525, 1521, 1524, 1519, 1516, 1525, 1531, 1515, 1526,
-     1526, 1532, 1522, 1518, 1527, 1527, 1534, 1523, 1528, 1528,
-     1536, 1533, 1535, 1537, 1538, 1538, 1541, 1531, 1542, 1532,
-     1543, 1535, 1540, 1540, 1544, 1541, 1534, 1543, 1545, 1546,
-     1536, 1537, 1547, 1548, 1549, 1549, 1542, 1550, 1551, 1544,
-     1552, 1553, 1550, 1555, 1554, 1557, 1545, 1546, 1547, 1554,
+     1495, 1492, 1497, 1498, 1498, 1499, 1500, 1497, 1503, 1507,
+     1501, 1504, 1509, 1489, 1482, 1501, 1505, 1505, 1507, 1508,
+     1510, 1499, 1516, 1504, 1508, 1512, 1512, 1503, 1500, 1514,
+     1509, 1515, 1517, 1515, 1514, 1510, 1516, 1517, 1518, 1518,
+     1519, 1519, 1520, 1520, 1521, 1522, 1523, 1523, 1524, 1525,
+     1526, 1528, 1527, 1529, 1529, 1530, 1521, 1527, 1531, 1532,
+     1524, 1525, 1526, 1522, 1530, 1533, 1534, 1535, 1536, 1536,
+     1538, 1528, 1539, 1537,    0, 1540, 1542, 1542, 1533, 1532,
+     1540, 1535, 1537, 1547, 1531, 1549, 1541, 1548, 1538, 1550,
+     1534, 1541, 1543, 1543, 1539, 1544, 1544, 1551, 1552, 1553,
 
-     1558, 1561, 1548, 1564, 1557, 1552, 1551, 1565, 1562,    0,
-     1553, 1562, 1569, 1555, 1563, 1563, 1566, 1566, 1564, 1558,
-     1567, 1561, 1570, 1572, 1567, 1565, 1570, 1569, 1571, 1571,
-     1574, 1574, 1575, 1576, 1576, 1582, 1572, 1577, 1577, 1581,
-     1581, 1583, 1585, 1584, 1586, 1587, 1590, 1585, 1588, 1586,
-     1591, 1575, 1584, 1592, 1583, 1591, 1588, 1582, 1592, 1593,
-     1596, 1590, 1594, 1594, 1587, 1595, 1595, 1596, 1597, 1604,
-     1598, 1599,    0, 1597, 1593, 1598, 1599, 1600, 1600, 1601,
-     1601, 1605, 1604, 1606, 1607, 1608, 1605, 1606, 1609, 1607,
-     1610, 1611, 1612, 1616, 1608, 1617, 1611, 1614, 1610, 1623,
+     1554, 1554, 1558, 1547, 1557, 1548, 1551, 1549, 1559, 1550,
+     1556, 1556, 1560, 1557, 1561, 1559, 1562, 1553, 1552, 1563,
+     1558, 1564, 1565, 1565, 1566, 1567, 1568, 1560, 1569, 1566,
+     1571, 1570, 1561, 1572, 1562, 1563, 1570, 1573, 1577, 1576,
+     1564, 1568, 1573, 1567, 1574, 1580, 1574, 1569, 1576, 1581,
+     1571, 1583, 1581, 1572, 1582, 1582, 1584, 1577, 1585, 1585,
+     1586, 1588, 1591, 1589, 1586, 1580, 1583, 1589, 1590, 1590,
+     1593, 1593, 1594, 1601, 1584, 1591, 1588, 1595, 1595, 1596,
+     1596, 1600, 1600, 1602, 1603, 1604, 1606, 1605, 1609, 1607,
+     1604, 1594, 1605, 1603, 1610, 1601, 1602, 1607, 1612, 1610,
 
-     1614, 1615, 1624, 1609, 1612, 1618, 1615, 1619, 1617, 1620,
-     1620, 1616, 1621, 1625, 1618, 1627, 1619, 1628, 1623, 1626,
-     1626, 1621, 1624, 1629, 1630, 1630, 1628, 1629, 1631, 1634,
-     1632, 1635, 1625, 1637, 1627, 1632, 1631, 1637, 1634, 1638,
-     1639, 1641, 1641, 1646, 1635, 1643, 1643, 1647, 1647, 1648,
-     1648, 1649, 1653, 1638, 1649, 1639, 1650, 1650, 1651, 1651,
-     1652, 1652, 1654, 1646, 1655, 1656, 1656, 1657, 1660, 1655,
-     1653, 1657, 1660, 1660, 1661, 1662, 1654, 1663, 1666, 1670,
-     1668, 1662, 1663, 1666, 1667, 1668, 1669, 1672, 1672, 1671,
-     1673, 1675, 1674, 1676, 1676, 1677, 1677, 1661, 1679, 1670,
+     1635, 1611,    0, 1609, 1615, 1606, 1611, 1613, 1613, 1614,
+     1614, 1615, 1616, 1612, 1617, 1618, 1623, 1616, 1635, 1617,
+     1618, 1619, 1619, 1620, 1620, 1624, 1627, 1625, 1626, 1623,
+     1624, 1625, 1628, 1626, 1629, 1627, 1630, 1631, 1636, 1634,
+     1633, 1630, 1629, 1633, 1634, 1637, 1638, 1628, 1640, 1631,
+     1642, 1636, 1639, 1639, 1637, 1638, 1643, 1640, 1644, 1645,
+     1645, 1646, 1647, 1648, 1649, 1649, 1650, 1653, 1651, 1642,
+     1657, 1647, 1651, 1652, 1652, 1653, 1643, 1644, 1648, 1654,
+     1646, 1656, 1659, 1657, 1654, 1650, 1659, 1660, 1661, 1668,
+     1656, 1663, 1663, 1665, 1665, 1669, 1669, 1670, 1670, 1671,
 
-     1674, 1667, 1667, 1671, 1669, 1678, 1678, 1680, 1681, 1673,
-     1675, 1682, 1680, 1683, 1679, 1684, 1685, 1687, 1687, 1689,
-     1688, 1691, 1683, 1688, 1689, 1692, 1692, 1693, 1681, 1694,
-     1695, 1693, 1698, 1703, 1700, 1684, 1685, 1682, 1694, 1691,
-     1697, 1698, 1696, 1700, 1701, 1695, 1696, 1696, 1709, 1707,
-     1708, 1708, 1716, 1697, 1707, 1711, 1701, 1709, 1703, 1715,
-     1711, 1712, 1712, 1714, 1714, 1712, 1717, 1718, 1715, 1719,
-     1721, 1717, 1716, 1720, 1719, 1721, 1722, 1723, 1723, 1725,
-     1726, 1727, 1727, 1728, 1730, 1729, 1731, 1732, 1718, 1729,
-     1735, 1720, 1733, 1730, 1734, 1726, 1728, 1745, 1725, 1734,
+     1675, 1660, 1671, 1661, 1672, 1672, 1673, 1673, 1676, 1668,
+     1674, 1674, 1677, 1678, 1678, 1679, 1682, 1677, 1675, 1679,
+     1682, 1682, 1676, 1683, 1684, 1689, 1685, 1688, 1690, 1691,
+     1684, 1685, 1688, 1690, 1692, 1693, 1694, 1694, 1695, 1697,
+     1696, 1704, 1689, 1689, 1698, 1698, 1683, 1691, 1696, 1693,
+     1699, 1699, 1700, 1700, 1692, 1701, 1702, 1695, 1697, 1703,
+     1705, 1702, 1706, 1707, 1709, 1709, 1711, 1704, 1716, 1705,
+     1710, 1701, 1714, 1710, 1713, 1713, 1720, 1714, 1719, 1703,
+     1717, 1717, 1706, 1707, 1711, 1718, 1716, 1719, 1721, 1718,
+     1722, 1720, 1721, 1721, 1726, 1723, 1725, 1728, 1733, 1733,
 
-     1733, 1722, 1731, 1736, 1736, 1737, 1732, 1739, 1739, 1740,
-     1740, 1744, 1741, 1743, 1743, 1746, 1735, 1741, 1748, 1748,
-     1745, 1749, 1750, 1753, 1737, 1751, 1751, 1752, 1752, 1754,
-     1755, 1744, 1756, 1756, 1746, 1749, 1757, 1758, 1758, 1757,
-     1760, 1754, 1753, 1761, 1750, 1762, 1763, 1764, 1762, 1765,
-     1755, 1763, 1760, 1766, 1765, 1767, 1767, 1769, 1769, 1770,
-     1772, 1772, 1773, 1761, 1775, 1774, 1764, 1773,    0, 1775,
-     1766, 1766, 1776, 1776, 1777, 1777, 1778, 1778, 1770, 1774,
-     1779, 1781, 1781, 1784, 1784, 1779, 1786, 1786, 1787, 1788,
-     1789, 1790, 1790, 1791, 1798, 1794, 1795, 1795, 1791, 1789,
+     1734,    0, 1732, 1722, 1723, 1725, 1726, 1732, 1736, 1734,
+     1737, 1737, 1740, 1736, 1737, 1739, 1739, 1741, 1742, 1743,
+     1744, 1740, 1728, 1742, 1745, 1744, 1746, 1747, 1748, 1748,
+     1750, 1746, 1751, 1752, 1752, 1753, 1755, 1741, 1756, 1754,
+     1743, 1757, 1745, 1754, 1760, 1755, 1759, 1751, 1753, 1750,
+     1758, 1759, 1747, 1762, 1756, 1761, 1761, 1771, 1758, 1772,
+     1757, 1764, 1764, 1765, 1765, 1767, 1767, 1773, 1768, 1776,
+     1760, 1777, 1762, 1768, 1770, 1770, 1780, 1771, 1775, 1775,
+     1778, 1778, 1772, 1776, 1779, 1779, 1773, 1781, 1782, 1783,
+     1783, 1784, 1787, 1777, 1784, 1780, 1785, 1785, 1788, 1781,
 
-     1796, 1799, 1787, 1794, 1801, 1796, 1800, 1802, 1803, 1788,
-     1851, 1800, 1804, 1805, 1798, 1802, 1801, 1806, 1807, 1810,
-     1830, 1799, 1851, 1807, 1812, 1812, 1803, 1823, 1804, 1830,
-     1805, 1805, 1813, 1813, 1818, 1818, 1814, 1820, 1806, 1810,
-     1814, 1820, 1822, 1822, 1824, 1823, 1826, 1826, 1827, 1829,
-     1831, 1831, 1832, 1832, 1833, 1833, 1834, 1835, 1824, 1836,
-     1837, 1834,    0, 1827, 1838, 1839, 1840, 1829, 1858, 1838,
-     1839, 1841, 1841, 1858, 1836, 1844, 1844, 1846, 1846, 1848,
-     1853, 1837, 1835, 1849, 1849, 1840, 1852, 1852, 1848, 1854,
-     1854, 1857, 1859, 1860, 1857, 1853, 1861, 1863, 1860, 1862,
+     1789, 1790, 1791, 1789, 1787, 1792, 1790, 1793, 1782, 1797,
+     1792, 1794, 1794, 1796, 1796, 1799, 1799, 1800, 1788, 1801,
+     1885, 1791, 1800, 1885, 1793, 1793, 1802, 1806, 1797, 1803,
+     1803, 1802, 1806, 1801, 1804, 1804, 1805, 1805, 1808, 1808,
+     1812, 1812, 1814, 1814, 1815, 1816, 1817, 1818, 1818, 1819,
+     1826, 1822, 1823, 1823, 1819, 1817, 1824, 1827, 1815, 1822,
+     1829, 1824, 1828, 1830, 1831, 1816, 1879, 1828, 1832, 1833,
+     1826, 1830, 1829, 1834, 1835, 1838, 1858, 1827, 1879, 1835,
+     1840, 1840, 1831, 1851, 1832, 1858, 1833, 1833, 1841, 1841,
+     1846, 1846, 1842, 1848, 1834, 1838, 1842, 1848, 1850, 1850,
 
-     1867, 1869, 1870, 1867, 1871, 1869, 1859, 1874, 1873, 1875,
-     1877, 1876, 1878, 1863, 1880, 1861, 1879, 1862, 1871, 1873,
-     1874, 1882, 1870, 1881, 1881, 1887, 1877, 1888, 1875, 1876,
-     1882, 1879, 1883, 1883, 1880, 1884, 1884, 1878, 1885, 1886,
-     1889, 1890, 1888, 1885, 1886, 1889, 1891, 1891, 1893, 1896,
-     1887, 1897, 1898, 1899, 1901, 1890, 1897, 1898, 1900, 1904,
-     1903, 1907, 1905, 1893, 1906, 1908, 1910, 1899, 1896, 1915,
-     1908, 1900,    0, 1901, 1903, 1905, 1909, 1906, 1904, 1912,
-     1907, 1909, 1911, 1911, 1912, 1910, 1913, 1914, 1915, 1916,
-     1918, 1913, 1914, 1919, 1916, 1917, 1917, 1918, 1920, 1921,
+     1852, 1851, 1854, 1854, 1855, 1857, 1859, 1859, 1860, 1860,
+     1861, 1861, 1862, 1863, 1852, 1864, 1865, 1862,    0, 1855,
+     1866, 1867, 1868, 1857, 1886, 1866, 1867, 1869, 1869, 1886,
+     1864, 1872, 1872, 1874, 1874, 1876, 1881, 1865, 1863, 1877,
+     1877, 1868, 1880, 1880, 1876, 1882, 1882, 1887, 1888, 1889,
+     1891, 1881, 1890, 1888, 1895, 1897, 1898, 1895, 1899, 1897,
+     1901, 1887, 1902, 1903, 1905, 1904, 1891, 1906, 1889, 1907,
+     1890, 1901, 1899, 1908,    0, 1902, 1898, 1909, 1909, 1910,
+     1905, 1915, 1903, 1904, 1907, 1911, 1911, 1916, 1910, 1912,
+     1912, 1913, 1906, 1908, 1914, 1917, 1913, 1918, 1921, 1914,
 
-     1922, 1923, 1925, 1926, 1921, 1927, 1930, 1925, 1928, 1929,
-     1929, 1930, 1919, 1931, 1923, 1932, 1932, 1920, 1934, 1922,
-     1935, 1928, 1926, 1934, 1927, 1933, 1933, 1935, 1936, 1937,
-     1937, 1938, 1931, 1939, 1940, 1942, 1941, 1944, 1938, 1945,
-     1939, 1941, 1944, 1946, 1945, 1947, 1949, 1936, 1948, 1948,
-     1950, 1951, 1951, 1940, 1942, 1952, 1952, 1954, 1954, 1953,
-     1955, 1955, 1946, 1956, 1947, 1949, 1953, 1958, 1961, 1950,
-     1956, 1962, 1958, 1961, 1963, 1964, 1964, 1965, 1965,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-     1962,    0,    0, 1963, 1969, 1969, 1969, 1969, 1969, 1969,
+     1917, 1924, 1916, 1919, 1919, 1925, 1915, 1926, 1927, 1929,
+     1925, 1918, 1926, 1921, 1928, 1931, 1932, 1933, 1934, 1935,
+     1924, 1936, 1927, 1938, 1939, 1939, 1936, 1928, 1929, 1931,
+     1933, 1934, 1937, 1943, 1940, 1932, 1941, 1937, 1935, 1940,
+     1942, 1941, 1938, 1944, 1946, 1942, 1945, 1945, 1944, 1947,
+     1948, 1946, 1943, 1949, 1950, 1953, 1954, 1951, 1949, 1955,
+     1953, 1956, 1957, 1957, 1959, 1964, 1958, 1962, 1947, 1948,
+     1951, 1958, 1962, 1950, 1956, 1954, 1960, 1960, 1955, 1961,
+     1961, 1963, 1966, 1959, 1964, 1965, 1965, 1967, 1963, 1966,
+     1968, 1969, 1970, 1972, 1967, 1973, 1969, 1974, 1972, 1975,
 
-     1969, 1970, 1970, 1970, 1970, 1970, 1970, 1970, 1971, 1971,
-     1971, 1971, 1971, 1971, 1971, 1972, 1972, 1972, 1972, 1972,
-     1972, 1972, 1973, 1973, 1973, 1973, 1973, 1973, 1973, 1975,
-     1975,    0, 1975, 1975, 1975, 1975, 1976, 1976,    0,    0,
-        0, 1976, 1976, 1977, 1977,    0,    0, 1977,    0, 1977,
-     1978,    0,    0,    0,    0,    0, 1978, 1979, 1979,    0,
-        0,    0, 1979, 1979, 1980,    0,    0,    0,    0,    0,
-     1980, 1981, 1981,    0, 1981, 1981, 1981, 1981, 1982, 1982,
-        0, 1982, 1982, 1982, 1982, 1968, 1968, 1968, 1968, 1968,
-     1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
+     1973, 1976, 1976, 1977, 1978, 1979, 1979, 1980, 1980, 1968,
+     1981, 1970, 1982, 1982, 1983, 1983, 1974, 1981, 1975, 1984,
+     1986, 1990, 1977, 1978, 1989, 1986, 1984, 1991,    0, 1989,
+     1992, 1992, 1993, 1993,    0,    0,    0,    0,    0,    0,
+     1990,    0,    0,    0,    0,    0, 1991, 1997, 1997, 1997,
+     1997, 1997, 1997, 1997, 1998, 1998, 1998, 1998, 1998, 1998,
+     1998, 1999, 1999, 1999, 1999, 1999, 1999, 1999, 2000, 2000,
+     2000, 2000, 2000, 2000, 2000, 2001, 2001, 2001, 2001, 2001,
+     2001, 2001, 2003, 2003,    0, 2003, 2003, 2003, 2003, 2004,
+     2004,    0,    0,    0, 2004, 2004, 2005, 2005,    0,    0,
 
-     1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
-     1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
-     1968, 1968, 1968, 1968, 1968
+     2005,    0, 2005, 2006,    0,    0,    0,    0,    0, 2006,
+     2007, 2007,    0,    0,    0, 2007, 2007, 2008,    0,    0,
+        0,    0,    0, 2008, 2009, 2009,    0, 2009, 2009, 2009,
+     2009, 2010, 2010,    0, 2010, 2010, 2010, 2010, 1996, 1996,
+     1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996,
+     1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996,
+     1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996,
+     1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -2171,7 +2191,7 @@ static void config_end_include(void)
 #define YY_NO_INPUT 1
 #endif
 
-#line 2173 "<stdout>"
+#line 2193 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -2394,7 +2414,7 @@ YY_DECL
 	{
 #line 207 "./util/configlexer.lex"
 
-#line 2396 "<stdout>"
+#line 2416 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -2427,13 +2447,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 1969 )
+				if ( yy_current_state >= 1997 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 3886 );
+		while ( yy_base[yy_current_state] != 3939 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -3330,68 +3350,88 @@ YY_RULE_SETUP
 case 173:
 YY_RULE_SETUP
 #line 390 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT) }
+{ YDVAR(1, VAR_IP_RATELIMIT) }
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
 #line 391 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_RATELIMIT) }
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
 #line 392 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
 #line 393 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+{ YDVAR(1, VAR_RATELIMIT_SLABS) }
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
 #line 394 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
 #line 395 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
+{ YDVAR(1, VAR_RATELIMIT_SIZE) }
 	YY_BREAK
 case 179:
-/* rule 179 can match eol */
 YY_RULE_SETUP
 #line 396 "./util/configlexer.lex"
+{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+	YY_BREAK
+case 180:
+YY_RULE_SETUP
+#line 397 "./util/configlexer.lex"
+{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+	YY_BREAK
+case 181:
+YY_RULE_SETUP
+#line 398 "./util/configlexer.lex"
+{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
+	YY_BREAK
+case 182:
+YY_RULE_SETUP
+#line 399 "./util/configlexer.lex"
+{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
+	YY_BREAK
+case 183:
+/* rule 183 can match eol */
+YY_RULE_SETUP
+#line 400 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 180:
+case 184:
 YY_RULE_SETUP
-#line 399 "./util/configlexer.lex"
+#line 403 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 400 "./util/configlexer.lex"
+#line 404 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 181:
+case 185:
 YY_RULE_SETUP
-#line 405 "./util/configlexer.lex"
+#line 409 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 182:
-/* rule 182 can match eol */
+case 186:
+/* rule 186 can match eol */
 YY_RULE_SETUP
-#line 406 "./util/configlexer.lex"
+#line 410 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 183:
+case 187:
 YY_RULE_SETUP
-#line 408 "./util/configlexer.lex"
+#line 412 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -3404,34 +3444,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 184:
+case 188:
 YY_RULE_SETUP
-#line 420 "./util/configlexer.lex"
+#line 424 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 421 "./util/configlexer.lex"
+#line 425 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 185:
+case 189:
 YY_RULE_SETUP
-#line 426 "./util/configlexer.lex"
+#line 430 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 186:
-/* rule 186 can match eol */
+case 190:
+/* rule 190 can match eol */
 YY_RULE_SETUP
-#line 427 "./util/configlexer.lex"
+#line 431 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 187:
+case 191:
 YY_RULE_SETUP
-#line 429 "./util/configlexer.lex"
+#line 433 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -3444,38 +3484,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 188:
+case 192:
 YY_RULE_SETUP
-#line 441 "./util/configlexer.lex"
+#line 445 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 443 "./util/configlexer.lex"
+#line 447 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 189:
+case 193:
 YY_RULE_SETUP
-#line 447 "./util/configlexer.lex"
+#line 451 "./util/configlexer.lex"
 { LEXOUT(("ISP ")); /* ignore */ }
 	YY_BREAK
-case 190:
-/* rule 190 can match eol */
+case 194:
+/* rule 194 can match eol */
 YY_RULE_SETUP
-#line 448 "./util/configlexer.lex"
+#line 452 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++;}
 	YY_BREAK
-case 191:
+case 195:
 YY_RULE_SETUP
-#line 449 "./util/configlexer.lex"
+#line 453 "./util/configlexer.lex"
 { LEXOUT(("IQS ")); BEGIN(include_quoted); }
 	YY_BREAK
-case 192:
+case 196:
 YY_RULE_SETUP
-#line 450 "./util/configlexer.lex"
+#line 454 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext);
@@ -3483,27 +3523,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 455 "./util/configlexer.lex"
+#line 459 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 193:
+case 197:
 YY_RULE_SETUP
-#line 459 "./util/configlexer.lex"
+#line 463 "./util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 194:
-/* rule 194 can match eol */
+case 198:
+/* rule 198 can match eol */
 YY_RULE_SETUP
-#line 460 "./util/configlexer.lex"
+#line 464 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 195:
+case 199:
 YY_RULE_SETUP
-#line 462 "./util/configlexer.lex"
+#line 466 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -3513,7 +3553,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 468 "./util/configlexer.lex"
+#line 472 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -3525,33 +3565,33 @@ case YY_STATE_EOF(val):
 	}
 }
 	YY_BREAK
-case 196:
+case 200:
 YY_RULE_SETUP
-#line 479 "./util/configlexer.lex"
+#line 483 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 197:
+case 201:
 YY_RULE_SETUP
-#line 483 "./util/configlexer.lex"
+#line 487 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 198:
+case 202:
 YY_RULE_SETUP
-#line 487 "./util/configlexer.lex"
+#line 491 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 199:
+case 203:
 YY_RULE_SETUP
-#line 491 "./util/configlexer.lex"
+#line 495 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 3553 "<stdout>"
+#line 3593 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -3842,7 +3882,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 1969 )
+			if ( yy_current_state >= 1997 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -3870,11 +3910,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 1969 )
+		if ( yy_current_state >= 1997 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 1968);
+	yy_is_jam = (yy_current_state == 1996);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -4513,7 +4553,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 491 "./util/configlexer.lex"
+#line 495 "./util/configlexer.lex"
 
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index 366f60895..0e6037cd1 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -387,11 +387,15 @@ dnstap-log-forwarder-query-messages{COLON}	{
 dnstap-log-forwarder-response-messages{COLON}	{
 		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
 disable-dnssec-lame-check{COLON} { YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
+ip-ratelimit{COLON}		{ YDVAR(1, VAR_IP_RATELIMIT) }
 ratelimit{COLON}		{ YDVAR(1, VAR_RATELIMIT) }
+ip-ratelimit-slabs{COLON}		{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
 ratelimit-slabs{COLON}		{ YDVAR(1, VAR_RATELIMIT_SLABS) }
+ip-ratelimit-size{COLON}		{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
 ratelimit-size{COLON}		{ YDVAR(1, VAR_RATELIMIT_SIZE) }
 ratelimit-for-domain{COLON}	{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
 ratelimit-below-domain{COLON}	{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+ip-ratelimit-factor{COLON}		{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
 ratelimit-factor{COLON}		{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
 <INITIAL,val>{NEWLINE}		{ LEXOUT(("NL\n")); cfg_parser->line++; }
 
diff --git a/util/configparser.c b/util/configparser.c
index 12e25ac14..c1eef6101 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -282,31 +282,35 @@ extern int yydebug;
     VAR_HARDEN_ALGO_DOWNGRADE = 413,
     VAR_IP_TRANSPARENT = 414,
     VAR_DISABLE_DNSSEC_LAME_CHECK = 415,
-    VAR_RATELIMIT = 416,
-    VAR_RATELIMIT_SLABS = 417,
-    VAR_RATELIMIT_SIZE = 418,
-    VAR_RATELIMIT_FOR_DOMAIN = 419,
-    VAR_RATELIMIT_BELOW_DOMAIN = 420,
-    VAR_RATELIMIT_FACTOR = 421,
-    VAR_CAPS_WHITELIST = 422,
-    VAR_CACHE_MAX_NEGATIVE_TTL = 423,
-    VAR_PERMIT_SMALL_HOLDDOWN = 424,
-    VAR_QNAME_MINIMISATION = 425,
-    VAR_QNAME_MINIMISATION_STRICT = 426,
-    VAR_IP_FREEBIND = 427,
-    VAR_DEFINE_TAG = 428,
-    VAR_LOCAL_ZONE_TAG = 429,
-    VAR_ACCESS_CONTROL_TAG = 430,
-    VAR_LOCAL_ZONE_OVERRIDE = 431,
-    VAR_ACCESS_CONTROL_TAG_ACTION = 432,
-    VAR_ACCESS_CONTROL_TAG_DATA = 433,
-    VAR_VIEW = 434,
-    VAR_ACCESS_CONTROL_VIEW = 435,
-    VAR_VIEW_FIRST = 436,
-    VAR_SERVE_EXPIRED = 437,
-    VAR_FAKE_DSA = 438,
-    VAR_LOG_IDENTITY = 439,
-    VAR_USE_SYSTEMD = 440
+    VAR_IP_RATELIMIT = 416,
+    VAR_IP_RATELIMIT_SLABS = 417,
+    VAR_IP_RATELIMIT_SIZE = 418,
+    VAR_RATELIMIT = 419,
+    VAR_RATELIMIT_SLABS = 420,
+    VAR_RATELIMIT_SIZE = 421,
+    VAR_RATELIMIT_FOR_DOMAIN = 422,
+    VAR_RATELIMIT_BELOW_DOMAIN = 423,
+    VAR_IP_RATELIMIT_FACTOR = 424,
+    VAR_RATELIMIT_FACTOR = 425,
+    VAR_CAPS_WHITELIST = 426,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 427,
+    VAR_PERMIT_SMALL_HOLDDOWN = 428,
+    VAR_QNAME_MINIMISATION = 429,
+    VAR_QNAME_MINIMISATION_STRICT = 430,
+    VAR_IP_FREEBIND = 431,
+    VAR_DEFINE_TAG = 432,
+    VAR_LOCAL_ZONE_TAG = 433,
+    VAR_ACCESS_CONTROL_TAG = 434,
+    VAR_LOCAL_ZONE_OVERRIDE = 435,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 436,
+    VAR_ACCESS_CONTROL_TAG_DATA = 437,
+    VAR_VIEW = 438,
+    VAR_ACCESS_CONTROL_VIEW = 439,
+    VAR_VIEW_FIRST = 440,
+    VAR_SERVE_EXPIRED = 441,
+    VAR_FAKE_DSA = 442,
+    VAR_LOG_IDENTITY = 443,
+    VAR_USE_SYSTEMD = 444
   };
 #endif
 /* Tokens.  */
@@ -468,31 +472,35 @@ extern int yydebug;
 #define VAR_HARDEN_ALGO_DOWNGRADE 413
 #define VAR_IP_TRANSPARENT 414
 #define VAR_DISABLE_DNSSEC_LAME_CHECK 415
-#define VAR_RATELIMIT 416
-#define VAR_RATELIMIT_SLABS 417
-#define VAR_RATELIMIT_SIZE 418
-#define VAR_RATELIMIT_FOR_DOMAIN 419
-#define VAR_RATELIMIT_BELOW_DOMAIN 420
-#define VAR_RATELIMIT_FACTOR 421
-#define VAR_CAPS_WHITELIST 422
-#define VAR_CACHE_MAX_NEGATIVE_TTL 423
-#define VAR_PERMIT_SMALL_HOLDDOWN 424
-#define VAR_QNAME_MINIMISATION 425
-#define VAR_QNAME_MINIMISATION_STRICT 426
-#define VAR_IP_FREEBIND 427
-#define VAR_DEFINE_TAG 428
-#define VAR_LOCAL_ZONE_TAG 429
-#define VAR_ACCESS_CONTROL_TAG 430
-#define VAR_LOCAL_ZONE_OVERRIDE 431
-#define VAR_ACCESS_CONTROL_TAG_ACTION 432
-#define VAR_ACCESS_CONTROL_TAG_DATA 433
-#define VAR_VIEW 434
-#define VAR_ACCESS_CONTROL_VIEW 435
-#define VAR_VIEW_FIRST 436
-#define VAR_SERVE_EXPIRED 437
-#define VAR_FAKE_DSA 438
-#define VAR_LOG_IDENTITY 439
-#define VAR_USE_SYSTEMD 440
+#define VAR_IP_RATELIMIT 416
+#define VAR_IP_RATELIMIT_SLABS 417
+#define VAR_IP_RATELIMIT_SIZE 418
+#define VAR_RATELIMIT 419
+#define VAR_RATELIMIT_SLABS 420
+#define VAR_RATELIMIT_SIZE 421
+#define VAR_RATELIMIT_FOR_DOMAIN 422
+#define VAR_RATELIMIT_BELOW_DOMAIN 423
+#define VAR_IP_RATELIMIT_FACTOR 424
+#define VAR_RATELIMIT_FACTOR 425
+#define VAR_CAPS_WHITELIST 426
+#define VAR_CACHE_MAX_NEGATIVE_TTL 427
+#define VAR_PERMIT_SMALL_HOLDDOWN 428
+#define VAR_QNAME_MINIMISATION 429
+#define VAR_QNAME_MINIMISATION_STRICT 430
+#define VAR_IP_FREEBIND 431
+#define VAR_DEFINE_TAG 432
+#define VAR_LOCAL_ZONE_TAG 433
+#define VAR_ACCESS_CONTROL_TAG 434
+#define VAR_LOCAL_ZONE_OVERRIDE 435
+#define VAR_ACCESS_CONTROL_TAG_ACTION 436
+#define VAR_ACCESS_CONTROL_TAG_DATA 437
+#define VAR_VIEW 438
+#define VAR_ACCESS_CONTROL_VIEW 439
+#define VAR_VIEW_FIRST 440
+#define VAR_SERVE_EXPIRED 441
+#define VAR_FAKE_DSA 442
+#define VAR_LOG_IDENTITY 443
+#define VAR_USE_SYSTEMD 444
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -503,7 +511,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 507 "util/configparser.c" /* yacc.c:355  */
+#line 515 "util/configparser.c" /* yacc.c:355  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -520,7 +528,7 @@ int yyparse (void);
 
 /* Copy the second part of user declarations.  */
 
-#line 524 "util/configparser.c" /* yacc.c:358  */
+#line 532 "util/configparser.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -762,21 +770,21 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   367
+#define YYLAST   375
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  186
+#define YYNTOKENS  190
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  196
+#define YYNNTS  200
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  375
+#define YYNRULES  383
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  562
+#define YYNSTATES  574
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   440
+#define YYMAXUTOK   444
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -829,51 +837,52 @@ static const yytype_uint8 yytranslate[] =
      155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
      165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
      175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185
+     185,   186,   187,   188,   189
 };
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   139,   139,   139,   140,   140,   141,   141,   142,   142,
-     142,   147,   152,   153,   154,   154,   154,   155,   155,   156,
-     156,   157,   157,   158,   158,   159,   159,   159,   160,   160,
-     160,   161,   161,   162,   162,   163,   163,   164,   164,   165,
-     165,   166,   166,   167,   167,   168,   168,   169,   169,   169,
-     170,   170,   170,   171,   171,   171,   172,   172,   173,   173,
-     174,   174,   175,   175,   176,   176,   176,   177,   177,   178,
-     178,   179,   179,   179,   180,   180,   181,   181,   182,   182,
-     183,   183,   183,   184,   184,   185,   185,   186,   186,   187,
-     187,   188,   188,   189,   189,   189,   190,   190,   191,   191,
-     191,   192,   192,   192,   193,   193,   193,   194,   194,   194,
-     194,   195,   195,   195,   196,   196,   196,   197,   197,   198,
-     198,   199,   199,   200,   200,   201,   201,   201,   202,   202,
-     203,   203,   204,   204,   205,   205,   206,   206,   206,   207,
-     207,   208,   208,   209,   209,   210,   210,   211,   211,   211,
-     213,   225,   226,   227,   227,   227,   227,   227,   228,   230,
-     242,   243,   244,   244,   244,   244,   245,   247,   261,   262,
-     263,   263,   263,   263,   265,   274,   283,   294,   303,   312,
-     321,   334,   349,   358,   367,   376,   385,   394,   403,   412,
-     421,   430,   439,   448,   457,   466,   475,   484,   491,   498,
-     507,   516,   525,   539,   548,   557,   566,   573,   580,   606,
-     614,   621,   628,   635,   642,   650,   658,   666,   673,   680,
-     689,   698,   705,   712,   720,   728,   738,   748,   758,   771,
-     782,   790,   803,   812,   821,   830,   840,   850,   858,   871,
-     880,   888,   897,   905,   918,   927,   934,   944,   954,   964,
-     974,   984,   994,  1004,  1014,  1021,  1028,  1035,  1044,  1053,
-    1062,  1069,  1079,  1096,  1103,  1121,  1134,  1147,  1156,  1165,
-    1174,  1183,  1193,  1203,  1212,  1221,  1234,  1243,  1250,  1259,
-    1268,  1277,  1286,  1294,  1307,  1315,  1343,  1350,  1365,  1375,
-    1385,  1392,  1399,  1408,  1422,  1441,  1460,  1472,  1484,  1496,
-    1507,  1516,  1524,  1537,  1550,  1563,  1572,  1582,  1592,  1602,
-    1609,  1616,  1625,  1635,  1645,  1655,  1662,  1669,  1678,  1688,
-    1698,  1727,  1736,  1745,  1750,  1751,  1752,  1752,  1752,  1753,
-    1753,  1753,  1754,  1754,  1756,  1766,  1775,  1782,  1792,  1799,
-    1806,  1813,  1820,  1825,  1826,  1827,  1827,  1828,  1828,  1829,
-    1829,  1830,  1831,  1832,  1833,  1834,  1835,  1837,  1845,  1852,
-    1860,  1868,  1875,  1882,  1891,  1900,  1909,  1918,  1927,  1936,
-    1941,  1942,  1943,  1945,  1951,  1961
+       0,   141,   141,   141,   142,   142,   143,   143,   144,   144,
+     144,   149,   154,   155,   156,   156,   156,   157,   157,   158,
+     158,   159,   159,   160,   160,   161,   161,   161,   162,   162,
+     162,   163,   163,   164,   164,   165,   165,   166,   166,   167,
+     167,   168,   168,   169,   169,   170,   170,   171,   171,   171,
+     172,   172,   172,   173,   173,   173,   174,   174,   175,   175,
+     176,   176,   177,   177,   178,   178,   178,   179,   179,   180,
+     180,   181,   181,   181,   182,   182,   183,   183,   184,   184,
+     185,   185,   185,   186,   186,   187,   187,   188,   188,   189,
+     189,   190,   190,   191,   191,   191,   192,   192,   193,   193,
+     193,   194,   194,   194,   195,   195,   195,   196,   196,   196,
+     196,   197,   197,   197,   198,   198,   198,   199,   199,   200,
+     200,   201,   201,   202,   202,   203,   203,   203,   204,   204,
+     205,   205,   206,   207,   207,   208,   209,   209,   210,   210,
+     211,   211,   211,   212,   212,   213,   213,   214,   214,   215,
+     215,   216,   216,   216,   218,   230,   231,   232,   232,   232,
+     232,   232,   233,   235,   247,   248,   249,   249,   249,   249,
+     250,   252,   266,   267,   268,   268,   268,   268,   270,   279,
+     288,   299,   308,   317,   326,   339,   354,   363,   372,   381,
+     390,   399,   408,   417,   426,   435,   444,   453,   462,   471,
+     480,   489,   496,   503,   512,   521,   530,   544,   553,   562,
+     571,   578,   585,   611,   619,   626,   633,   640,   647,   655,
+     663,   671,   678,   685,   694,   703,   710,   717,   725,   733,
+     743,   753,   763,   776,   787,   795,   808,   817,   826,   835,
+     845,   855,   863,   876,   885,   893,   902,   910,   923,   932,
+     939,   949,   959,   969,   979,   989,   999,  1009,  1019,  1026,
+    1033,  1040,  1049,  1058,  1067,  1074,  1084,  1101,  1108,  1126,
+    1139,  1152,  1161,  1170,  1179,  1188,  1198,  1208,  1217,  1226,
+    1239,  1248,  1255,  1264,  1273,  1282,  1291,  1299,  1312,  1320,
+    1348,  1355,  1370,  1380,  1390,  1397,  1404,  1413,  1427,  1446,
+    1465,  1477,  1489,  1501,  1512,  1522,  1531,  1539,  1547,  1560,
+    1573,  1586,  1599,  1608,  1617,  1627,  1637,  1647,  1654,  1661,
+    1670,  1680,  1690,  1700,  1707,  1714,  1723,  1733,  1743,  1772,
+    1781,  1790,  1795,  1796,  1797,  1797,  1797,  1798,  1798,  1798,
+    1799,  1799,  1801,  1811,  1820,  1827,  1837,  1844,  1851,  1858,
+    1865,  1870,  1871,  1872,  1872,  1873,  1873,  1874,  1874,  1875,
+    1876,  1877,  1878,  1879,  1880,  1882,  1890,  1897,  1905,  1913,
+    1920,  1927,  1936,  1945,  1954,  1963,  1972,  1981,  1986,  1987,
+    1988,  1990,  1996,  2006
 };
 #endif
 
@@ -937,33 +946,35 @@ static const char *const yytname[] =
   "VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES",
   "VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES",
   "VAR_HARDEN_ALGO_DOWNGRADE", "VAR_IP_TRANSPARENT",
-  "VAR_DISABLE_DNSSEC_LAME_CHECK", "VAR_RATELIMIT", "VAR_RATELIMIT_SLABS",
-  "VAR_RATELIMIT_SIZE", "VAR_RATELIMIT_FOR_DOMAIN",
-  "VAR_RATELIMIT_BELOW_DOMAIN", "VAR_RATELIMIT_FACTOR",
-  "VAR_CAPS_WHITELIST", "VAR_CACHE_MAX_NEGATIVE_TTL",
-  "VAR_PERMIT_SMALL_HOLDDOWN", "VAR_QNAME_MINIMISATION",
-  "VAR_QNAME_MINIMISATION_STRICT", "VAR_IP_FREEBIND", "VAR_DEFINE_TAG",
-  "VAR_LOCAL_ZONE_TAG", "VAR_ACCESS_CONTROL_TAG",
-  "VAR_LOCAL_ZONE_OVERRIDE", "VAR_ACCESS_CONTROL_TAG_ACTION",
-  "VAR_ACCESS_CONTROL_TAG_DATA", "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW",
-  "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_FAKE_DSA",
-  "VAR_LOG_IDENTITY", "VAR_USE_SYSTEMD", "$accept", "toplevelvars",
-  "toplevelvar", "serverstart", "contents_server", "content_server",
-  "stubstart", "contents_stub", "content_stub", "forwardstart",
-  "contents_forward", "content_forward", "viewstart", "contents_view",
-  "content_view", "server_num_threads", "server_verbosity",
-  "server_statistics_interval", "server_statistics_cumulative",
-  "server_extended_statistics", "server_port", "server_interface",
-  "server_outgoing_interface", "server_outgoing_range",
-  "server_outgoing_port_permit", "server_outgoing_port_avoid",
-  "server_outgoing_num_tcp", "server_incoming_num_tcp",
-  "server_interface_automatic", "server_do_ip4", "server_do_ip6",
-  "server_do_udp", "server_do_tcp", "server_prefer_ip6", "server_tcp_mss",
-  "server_outgoing_tcp_mss", "server_tcp_upstream", "server_ssl_upstream",
-  "server_ssl_service_key", "server_ssl_service_pem", "server_ssl_port",
-  "server_use_systemd", "server_do_daemonize", "server_use_syslog",
-  "server_log_time_ascii", "server_log_queries", "server_log_replies",
-  "server_chroot", "server_username", "server_directory", "server_logfile",
+  "VAR_DISABLE_DNSSEC_LAME_CHECK", "VAR_IP_RATELIMIT",
+  "VAR_IP_RATELIMIT_SLABS", "VAR_IP_RATELIMIT_SIZE", "VAR_RATELIMIT",
+  "VAR_RATELIMIT_SLABS", "VAR_RATELIMIT_SIZE", "VAR_RATELIMIT_FOR_DOMAIN",
+  "VAR_RATELIMIT_BELOW_DOMAIN", "VAR_IP_RATELIMIT_FACTOR",
+  "VAR_RATELIMIT_FACTOR", "VAR_CAPS_WHITELIST",
+  "VAR_CACHE_MAX_NEGATIVE_TTL", "VAR_PERMIT_SMALL_HOLDDOWN",
+  "VAR_QNAME_MINIMISATION", "VAR_QNAME_MINIMISATION_STRICT",
+  "VAR_IP_FREEBIND", "VAR_DEFINE_TAG", "VAR_LOCAL_ZONE_TAG",
+  "VAR_ACCESS_CONTROL_TAG", "VAR_LOCAL_ZONE_OVERRIDE",
+  "VAR_ACCESS_CONTROL_TAG_ACTION", "VAR_ACCESS_CONTROL_TAG_DATA",
+  "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW", "VAR_VIEW_FIRST",
+  "VAR_SERVE_EXPIRED", "VAR_FAKE_DSA", "VAR_LOG_IDENTITY",
+  "VAR_USE_SYSTEMD", "$accept", "toplevelvars", "toplevelvar",
+  "serverstart", "contents_server", "content_server", "stubstart",
+  "contents_stub", "content_stub", "forwardstart", "contents_forward",
+  "content_forward", "viewstart", "contents_view", "content_view",
+  "server_num_threads", "server_verbosity", "server_statistics_interval",
+  "server_statistics_cumulative", "server_extended_statistics",
+  "server_port", "server_interface", "server_outgoing_interface",
+  "server_outgoing_range", "server_outgoing_port_permit",
+  "server_outgoing_port_avoid", "server_outgoing_num_tcp",
+  "server_incoming_num_tcp", "server_interface_automatic", "server_do_ip4",
+  "server_do_ip6", "server_do_udp", "server_do_tcp", "server_prefer_ip6",
+  "server_tcp_mss", "server_outgoing_tcp_mss", "server_tcp_upstream",
+  "server_ssl_upstream", "server_ssl_service_key",
+  "server_ssl_service_pem", "server_ssl_port", "server_use_systemd",
+  "server_do_daemonize", "server_use_syslog", "server_log_time_ascii",
+  "server_log_queries", "server_log_replies", "server_chroot",
+  "server_username", "server_directory", "server_logfile",
   "server_pidfile", "server_root_hints", "server_dlv_anchor_file",
   "server_dlv_anchor", "server_auto_trust_anchor_file",
   "server_trust_anchor_file", "server_trusted_keys_file",
@@ -1003,14 +1014,15 @@ static const char *const yytname[] =
   "server_dns64_synthall", "server_define_tag", "server_local_zone_tag",
   "server_access_control_tag", "server_access_control_tag_action",
   "server_access_control_tag_data", "server_local_zone_override",
-  "server_access_control_view", "server_ratelimit",
-  "server_ratelimit_size", "server_ratelimit_slabs",
+  "server_access_control_view", "server_ip_ratelimit", "server_ratelimit",
+  "server_ip_ratelimit_size", "server_ratelimit_size",
+  "server_ip_ratelimit_slabs", "server_ratelimit_slabs",
   "server_ratelimit_for_domain", "server_ratelimit_below_domain",
-  "server_ratelimit_factor", "server_qname_minimisation",
-  "server_qname_minimisation_strict", "stub_name", "stub_host",
-  "stub_addr", "stub_first", "stub_ssl_upstream", "stub_prime",
-  "forward_name", "forward_host", "forward_addr", "forward_first",
-  "forward_ssl_upstream", "view_name", "view_local_zone",
+  "server_ip_ratelimit_factor", "server_ratelimit_factor",
+  "server_qname_minimisation", "server_qname_minimisation_strict",
+  "stub_name", "stub_host", "stub_addr", "stub_first", "stub_ssl_upstream",
+  "stub_prime", "forward_name", "forward_host", "forward_addr",
+  "forward_first", "forward_ssl_upstream", "view_name", "view_local_zone",
   "view_local_data", "view_first", "rcstart", "contents_rc", "content_rc",
   "rc_control_enable", "rc_control_port", "rc_control_interface",
   "rc_control_use_cert", "rc_server_key_file", "rc_server_cert_file",
@@ -1052,14 +1064,14 @@ static const yytype_uint16 yytoknum[] =
      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
      415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
      425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,   440
+     435,   436,   437,   438,   439,   440,   441,   442,   443,   444
 };
 # endif
 
-#define YYPACT_NINF -131
+#define YYPACT_NINF -132
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-131)))
+  (!!((Yystate) == (-132)))
 
 #define YYTABLE_NINF -1
 
@@ -1070,63 +1082,64 @@ static const yytype_uint16 yytoknum[] =
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    -131,     0,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,   136,   -38,
-     -34,   -39,   -64,  -130,  -105,    -3,    -2,    -1,     2,     3,
-      26,    29,    30,    32,    33,    34,    35,    36,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    56,    57,    58,    59,    60,
+    -132,     0,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,   134,   -39,
+     -35,   -11,   -62,  -131,  -106,    -4,    -3,    -2,    -1,     2,
+      17,    18,    28,    29,    30,    32,    33,    34,    35,    36,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    57,    58,    59,    60,
       61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
       71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      82,    83,    84,    86,    89,    91,    92,    93,    94,    95,
+      82,    83,    85,    88,    90,    91,    92,    93,    94,    95,
       96,    98,    99,   100,   101,   102,   103,   104,   105,   106,
      107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
      117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   133,   134,   137,   166,   167,
-     168,   173,   174,   175,   217,   218,   219,   220,   221,   222,
-     223,   224,   225,   229,   233,   234,   258,   259,   260,   261,
+     127,   128,   129,   130,   131,   132,   133,   165,   166,   167,
+     171,   172,   215,   216,   217,   218,   219,   220,   221,   222,
+     223,   227,   231,   232,   256,   257,   258,   259,   269,   270,
      271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,   282,   283,
-     305,   307,   312,   313,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,   314,   315,   316,   317,   318,  -131,  -131,  -131,  -131,
-    -131,  -131,   319,   320,   321,   322,  -131,  -131,  -131,  -131,
-    -131,   323,   324,   325,   326,   327,   328,   329,   330,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,   331,   332,
-     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,   343,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,   344,   345,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,   346,   347,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,   348,   349,   350,   351,   352,   353,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,   354,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,   355,   356,   357,  -131,  -131,  -131,
-    -131,  -131
+     281,   307,   309,   314,   315,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,   316,   317,   318,   319,
+     320,   321,  -132,  -132,  -132,  -132,  -132,  -132,  -132,   322,
+     323,   324,   325,   326,  -132,  -132,  -132,  -132,  -132,  -132,
+     327,   328,   329,   330,  -132,  -132,  -132,  -132,  -132,   331,
+     332,   333,   334,   335,   336,   337,   338,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,   339,   340,   341,   342,
+     343,   344,   345,   346,   347,   348,   349,   350,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,   351,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+     352,   353,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,   354,   355,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,   356,   357,   358,   359,   360,   361,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,   362,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,   363,   364,   365,  -132,
+    -132,  -132,  -132,  -132
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1134,8 +1147,8 @@ static const yytype_int16 yypact[] =
      means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       2,     0,     1,    11,   150,   159,   323,   369,   342,   167,
-       3,    13,   152,   161,   169,   325,   344,   371,     4,     5,
+       2,     0,     1,    11,   154,   163,   331,   377,   350,   171,
+       3,    13,   156,   165,   173,   333,   352,   379,     4,     5,
        6,    10,     8,     9,     7,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1150,97 +1163,98 @@ static const yytype_uint16 yydefact[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    12,    14,    15,    74,    77,    86,    16,    25,    65,
-      17,    78,    79,    36,    58,    73,    18,    19,    21,    22,
-      20,    23,    24,   109,   110,   111,   112,   113,   149,    75,
-      64,    90,   107,   108,    26,    27,    28,    29,    30,    66,
-      80,    81,    96,    52,    62,    53,    91,    46,    47,    48,
-      49,   100,   104,   117,   125,   136,   101,    59,    31,    32,
-      33,    88,   118,   119,   120,    34,    35,    37,    38,    40,
-      41,    39,   123,    42,    43,    44,    50,    69,   105,    83,
-     124,    76,   132,    84,    85,   102,   103,    89,    45,    67,
-      70,    51,    54,    92,    93,    68,   133,    94,    55,    56,
-      57,   106,   146,   147,    95,    63,    97,    98,    99,   134,
-      60,    61,    82,    71,    72,    87,   114,   115,   116,   121,
-     122,   137,   138,   140,   142,   143,   141,   144,   126,   128,
-     127,   129,   130,   131,   135,   145,   139,   148,     0,     0,
-       0,     0,     0,     0,   151,   153,   154,   155,   157,   158,
-     156,     0,     0,     0,     0,     0,   160,   162,   163,   164,
-     165,   166,     0,     0,     0,     0,   168,   170,   171,   172,
-     173,     0,     0,     0,     0,     0,     0,     0,     0,   324,
-     326,   328,   327,   333,   329,   330,   331,   332,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     343,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-     354,   355,   356,     0,   370,   372,   175,   174,   179,   182,
-     180,   188,   189,   192,   190,   191,   193,   194,   206,   207,
-     208,   209,   210,   230,   231,   232,   237,   238,   185,   239,
-     240,   243,   241,   242,   245,   246,   247,   260,   219,   220,
-     221,   222,   248,   263,   215,   217,   264,   270,   271,   272,
-     186,   229,   282,   283,   216,   277,   202,   181,   211,   261,
-     267,   249,     0,     0,   286,   187,   176,   201,   253,   177,
-     183,   184,   212,   213,   284,   251,   255,   256,   178,   287,
-     233,   259,   203,   218,   265,   266,   269,   276,   214,   280,
-     278,   279,   223,   228,   257,   258,   224,   225,   250,   273,
-     204,   205,   195,   196,   197,   198,   199,   288,   289,   290,
-     234,   235,   236,   244,   291,   292,   252,   226,   374,   300,
-     302,   301,     0,     0,   305,   254,   268,   281,   306,   307,
-     227,   293,     0,     0,     0,     0,     0,     0,   274,   275,
-     375,   200,   308,   309,   310,   313,   312,   311,   314,   315,
-     316,   317,   318,   319,     0,   321,   322,   334,   336,   335,
-     338,   339,   340,   341,   337,   357,   358,   359,   360,   361,
-     362,   363,   364,   365,   366,   367,   368,   373,   262,   285,
-     303,   304,   294,   295,     0,     0,     0,   299,   320,   298,
-     296,   297
+       0,     0,     0,     0,     0,    12,    14,    15,    74,    77,
+      86,    16,    25,    65,    17,    78,    79,    36,    58,    73,
+      18,    19,    21,    22,    20,    23,    24,   109,   110,   111,
+     112,   113,   153,    75,    64,    90,   107,   108,    26,    27,
+      28,    29,    30,    66,    80,    81,    96,    52,    62,    53,
+      91,    46,    47,    48,    49,   100,   104,   117,   125,   140,
+     101,    59,    31,    32,    33,    88,   118,   119,   120,    34,
+      35,    37,    38,    40,    41,    39,   123,    42,    43,    44,
+      50,    69,   105,    83,   124,    76,   136,    84,    85,   102,
+     103,    89,    45,    67,    70,    51,    54,    92,    93,    68,
+     137,    94,    55,    56,    57,   106,   150,   151,    95,    63,
+      97,    98,    99,   138,    60,    61,    82,    71,    72,    87,
+     114,   115,   116,   121,   122,   141,   142,   144,   146,   147,
+     145,   148,   126,   127,   130,   131,   128,   129,   132,   133,
+     135,   134,   139,   149,   143,   152,     0,     0,     0,     0,
+       0,     0,   155,   157,   158,   159,   161,   162,   160,     0,
+       0,     0,     0,     0,   164,   166,   167,   168,   169,   170,
+       0,     0,     0,     0,   172,   174,   175,   176,   177,     0,
+       0,     0,     0,     0,     0,     0,     0,   332,   334,   336,
+     335,   341,   337,   338,   339,   340,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   351,   353,
+     354,   355,   356,   357,   358,   359,   360,   361,   362,   363,
+     364,     0,   378,   380,   179,   178,   183,   186,   184,   192,
+     193,   196,   194,   195,   197,   198,   210,   211,   212,   213,
+     214,   234,   235,   236,   241,   242,   189,   243,   244,   247,
+     245,   246,   249,   250,   251,   264,   223,   224,   225,   226,
+     252,   267,   219,   221,   268,   274,   275,   276,   190,   233,
+     286,   287,   220,   281,   206,   185,   215,   265,   271,   253,
+       0,     0,   290,   191,   180,   205,   257,   181,   187,   188,
+     216,   217,   288,   255,   259,   260,   182,   291,   237,   263,
+     207,   222,   269,   270,   273,   280,   218,   284,   282,   283,
+     227,   232,   261,   262,   228,   229,   254,   277,   208,   209,
+     199,   200,   201,   202,   203,   292,   293,   294,   238,   239,
+     240,   248,   295,   296,   256,   230,   382,   304,   308,   306,
+     305,   309,   307,     0,     0,   312,   313,   258,   272,   285,
+     314,   315,   231,   297,     0,     0,     0,     0,     0,     0,
+     278,   279,   383,   204,   316,   317,   318,   321,   320,   319,
+     322,   323,   324,   325,   326,   327,     0,   329,   330,   342,
+     344,   343,   346,   347,   348,   349,   345,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   381,
+     266,   289,   310,   311,   298,   299,     0,     0,     0,   303,
+     328,   302,   300,   301
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    10,    11,    18,   161,    12,    19,   304,    13,
-      20,   316,    14,    21,   326,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   305,
-     306,   307,   308,   309,   310,   317,   318,   319,   320,   321,
-     327,   328,   329,   330,    15,    22,   339,   340,   341,   342,
-     343,   344,   345,   346,   347,    16,    23,   360,   361,   362,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-      17,    24,   374,   375,   296,   297
+      -1,     1,    10,    11,    18,   165,    12,    19,   312,    13,
+      20,   324,    14,    21,   334,   166,   167,   168,   169,   170,
+     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
+     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
+     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
+     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
+     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
+     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
+     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
+     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
+     301,   302,   303,   313,   314,   315,   316,   317,   318,   325,
+     326,   327,   328,   329,   335,   336,   337,   338,    15,    22,
+     347,   348,   349,   350,   351,   352,   353,   354,   355,    16,
+      23,   368,   369,   370,   371,   372,   373,   374,   375,   376,
+     377,   378,   379,   380,    17,    24,   382,   383,   304,   305
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1248,93 +1262,95 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_uint16 yytable[] =
 {
-       2,   322,   298,   373,   299,   300,   311,   376,   377,   378,
-       0,     3,   379,   380,   312,   313,   348,   349,   350,   351,
-     352,   353,   354,   355,   356,   357,   358,   359,   331,   332,
-     333,   334,   335,   336,   337,   338,   381,   323,   324,   382,
-     383,     4,   384,   385,   386,   387,   388,     5,   389,   390,
-     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,   405,   301,   406,   407,   408,   409,
-     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
-     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
-     430,     6,   431,   432,   433,   302,   434,   303,   314,   435,
-     315,   436,   437,   438,   439,   440,   441,     7,   442,   443,
-     444,   445,   446,   447,   448,   449,   450,   451,   452,   453,
-     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,   471,   472,   473,
-     474,   475,   325,   476,   477,     8,     0,   478,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,   479,   480,   481,     9,
-      53,    54,    55,   482,   483,   484,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    95,    96,   485,   486,   487,
-     488,   489,   490,   491,   492,   493,    97,    98,    99,   494,
-     100,   101,   102,   495,   496,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   497,   498,
-     499,   500,   126,   127,   128,   129,   130,   131,   132,   133,
-     134,   501,   502,   503,   504,   505,   506,   507,   508,   509,
-     510,   511,   512,   513,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   514,   156,   515,   157,   158,
-     159,   160,   516,   517,   518,   519,   520,   521,   522,   523,
-     524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
-     534,   535,   536,   537,   538,   539,   540,   541,   542,   543,
-     544,   545,   546,   547,   548,   549,   550,   551,   552,   553,
-     554,   555,   556,   557,   558,   559,   560,   561
+       2,   306,   381,   307,   308,   319,   384,   385,   386,   387,
+       0,     3,   388,   320,   321,   356,   357,   358,   359,   360,
+     361,   362,   363,   364,   365,   366,   367,   389,   390,   330,
+     339,   340,   341,   342,   343,   344,   345,   346,   391,   392,
+     393,     4,   394,   395,   396,   397,   398,     5,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,   412,   413,   414,   309,   331,   332,   415,   416,   417,
+     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,     6,   439,   440,   310,   441,   311,   322,   442,   323,
+     443,   444,   445,   446,   447,   448,   449,     7,   450,   451,
+     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
+     462,   463,   464,   465,   466,   467,   468,   469,   470,   471,
+     472,   473,   474,   475,   476,   477,   478,   479,   480,   481,
+     482,   483,   484,   485,     0,     8,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,   333,   486,   487,   488,    53,    54,
+      55,   489,   490,     9,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,   491,   492,   493,   494,   495,
+     496,   497,   498,   499,    97,    98,    99,   500,   100,   101,
+     102,   501,   502,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   503,   504,   505,   506,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   507,
+     508,   509,   510,   511,   512,   513,   514,   515,   516,   517,
+     518,   519,   135,   136,   137,   138,   139,   140,   141,   142,
+     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
+     153,   154,   155,   156,   157,   158,   159,   520,   160,   521,
+     161,   162,   163,   164,   522,   523,   524,   525,   526,   527,
+     528,   529,   530,   531,   532,   533,   534,   535,   536,   537,
+     538,   539,   540,   541,   542,   543,   544,   545,   546,   547,
+     548,   549,   550,   551,   552,   553,   554,   555,   556,   557,
+     558,   559,   560,   561,   562,   563,   564,   565,   566,   567,
+     568,   569,   570,   571,   572,   573
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,    40,    40,   108,    42,    43,    40,    10,    10,    10,
-      -1,    11,    10,    10,    48,    49,   146,   147,   148,   149,
-     150,   151,   152,   153,   154,   155,   156,   157,    92,    93,
-      94,    95,    96,    97,    98,    99,    10,    76,    77,    10,
+       0,    40,   108,    42,    43,    40,    10,    10,    10,    10,
+      -1,    11,    10,    48,    49,   146,   147,   148,   149,   150,
+     151,   152,   153,   154,   155,   156,   157,    10,    10,    40,
+      92,    93,    94,    95,    96,    97,    98,    99,    10,    10,
       10,    41,    10,    10,    10,    10,    10,    47,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,   103,    10,    10,    10,    10,
+      10,    10,    10,    10,   103,    76,    77,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    91,    10,    10,    10,   133,    10,   135,   132,    10,
-     134,    10,    10,    10,    10,    10,    10,   107,    10,    10,
+      10,    91,    10,    10,   133,    10,   135,   132,    10,   134,
+      10,    10,    10,    10,    10,    10,    10,   107,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,   181,    10,    10,   145,    -1,    10,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    10,    10,    10,   179,
-      44,    45,    46,    10,    10,    10,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,    90,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,   100,   101,   102,    10,
-     104,   105,   106,    10,    10,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,   126,   127,   128,   129,   130,   131,    10,    10,
-      10,    10,   136,   137,   138,   139,   140,   141,   142,   143,
-     144,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,   158,   159,   160,   161,   162,   163,
-     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,    10,   180,    10,   182,   183,
-     184,   185,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    -1,   145,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,   185,    10,    10,    10,    44,    45,
+      46,    10,    10,   183,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,   100,   101,   102,    10,   104,   105,
+     106,    10,    10,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,    10,    10,    10,    10,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,    10,   184,    10,
+     186,   187,   188,   189,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
-       0,   187,     0,    11,    41,    47,    91,   107,   145,   179,
-     188,   189,   192,   195,   198,   350,   361,   376,   190,   193,
-     196,   199,   351,   362,   377,    12,    13,    14,    15,    16,
+       0,   191,     0,    11,    41,    47,    91,   107,   145,   183,
+     192,   193,   196,   199,   202,   358,   369,   384,   194,   197,
+     200,   203,   359,   370,   385,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
       27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
       37,    38,    39,    44,    45,    46,    50,    51,    52,    53,
@@ -1347,8 +1363,8 @@ static const yytype_uint16 yystos[] =
      126,   127,   128,   129,   130,   131,   136,   137,   138,   139,
      140,   141,   142,   143,   144,   158,   159,   160,   161,   162,
      163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   180,   182,   183,   184,
-     185,   191,   201,   202,   203,   204,   205,   206,   207,   208,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+     184,   186,   187,   188,   189,   195,   205,   206,   207,   208,
      209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
      219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
      229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
@@ -1361,15 +1377,16 @@ static const yytype_uint16 yystos[] =
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
      309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
      319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   380,   381,    40,    42,
-      43,   103,   133,   135,   194,   335,   336,   337,   338,   339,
-     340,    40,    48,    49,   132,   134,   197,   341,   342,   343,
-     344,   345,    40,    76,    77,   181,   200,   346,   347,   348,
-     349,    92,    93,    94,    95,    96,    97,    98,    99,   352,
-     353,   354,   355,   356,   357,   358,   359,   360,   146,   147,
-     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   108,   378,   379,    10,    10,    10,    10,
+     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
+     339,   340,   341,   342,   388,   389,    40,    42,    43,   103,
+     133,   135,   198,   343,   344,   345,   346,   347,   348,    40,
+      48,    49,   132,   134,   201,   349,   350,   351,   352,   353,
+      40,    76,    77,   185,   204,   354,   355,   356,   357,    92,
+      93,    94,    95,    96,    97,    98,    99,   360,   361,   362,
+     363,   364,   365,   366,   367,   368,   146,   147,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   371,   372,
+     373,   374,   375,   376,   377,   378,   379,   380,   381,   382,
+     383,   108,   386,   387,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -1388,30 +1405,30 @@ static const yytype_uint16 yystos[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10
+      10,    10,    10,    10
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   186,   187,   187,   188,   188,   188,   188,   188,   188,
-     188,   189,   190,   190,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     192,   193,   193,   194,   194,   194,   194,   194,   194,   195,
-     196,   196,   197,   197,   197,   197,   197,   198,   199,   199,
-     200,   200,   200,   200,   201,   202,   203,   204,   205,   206,
+       0,   190,   191,   191,   192,   192,   192,   192,   192,   192,
+     192,   193,   194,   194,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   196,   197,   197,   198,   198,   198,
+     198,   198,   198,   199,   200,   200,   201,   201,   201,   201,
+     201,   202,   203,   203,   204,   204,   204,   204,   205,   206,
      207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
      217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
      227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
@@ -1426,12 +1443,13 @@ static const yytype_uint16 yyr1[] =
      317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
      327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
      337,   338,   339,   340,   341,   342,   343,   344,   345,   346,
-     347,   348,   349,   350,   351,   351,   352,   352,   352,   352,
-     352,   352,   352,   352,   353,   354,   355,   356,   357,   358,
-     359,   360,   361,   362,   362,   363,   363,   363,   363,   363,
-     363,   363,   363,   363,   363,   363,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   377,   378,   379,   380,   381
+     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
+     357,   358,   359,   359,   360,   360,   360,   360,   360,   360,
+     360,   360,   361,   362,   363,   364,   365,   366,   367,   368,
+     369,   370,   370,   371,   371,   371,   371,   371,   371,   371,
+     371,   371,   371,   371,   371,   372,   373,   374,   375,   376,
+     377,   378,   379,   380,   381,   382,   383,   384,   385,   385,
+     386,   387,   388,   389
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1452,29 +1470,30 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     2,     0,     1,     1,     1,     1,
+       1,     1,     2,     0,     1,     1,     1,     1,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     3,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
+       2,     2,     2,     2,     2,     2,     2,     2,     3,     3,
+       4,     4,     4,     3,     2,     2,     2,     2,     2,     2,
+       3,     3,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     3,     2,
+       2,     1,     2,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     2,     2,     2,     2,     2,     2,     2,     2,
        1,     2,     0,     1,     1,     1,     1,     1,     1,     1,
-       2,     0,     1,     1,     1,     1,     1,     1,     2,     0,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     3,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     3,     2,     2,     2,     2,
-       2,     2,     2,     2,     3,     3,     4,     4,     4,     3,
-       2,     2,     2,     3,     3,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       3,     2,     2,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
-       2,     2,     1,     2,     0,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     1,
-       2,     0,     1,     2,     2,     2
+       1,     1,     1,     1,     1,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     1,     2,     0,
+       1,     2,     2,     2
 };
 
 
@@ -2151,15 +2170,15 @@ yyreduce:
   switch (yyn)
     {
         case 11:
-#line 148 "./util/configparser.y" /* yacc.c:1646  */
+#line 150 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(server:)\n")); 
 	}
-#line 2159 "util/configparser.c" /* yacc.c:1646  */
+#line 2178 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 150:
-#line 214 "./util/configparser.y" /* yacc.c:1646  */
+  case 154:
+#line 219 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_stub* s;
 		OUTYY(("\nP(stub_zone:)\n")); 
@@ -2170,11 +2189,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2174 "util/configparser.c" /* yacc.c:1646  */
+#line 2193 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 159:
-#line 231 "./util/configparser.y" /* yacc.c:1646  */
+  case 163:
+#line 236 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_stub* s;
 		OUTYY(("\nP(forward_zone:)\n")); 
@@ -2185,11 +2204,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2189 "util/configparser.c" /* yacc.c:1646  */
+#line 2208 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 167:
-#line 248 "./util/configparser.y" /* yacc.c:1646  */
+  case 171:
+#line 253 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_view* s;
 		OUTYY(("\nP(view:)\n")); 
@@ -2202,11 +2221,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2206 "util/configparser.c" /* yacc.c:1646  */
+#line 2225 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 174:
-#line 266 "./util/configparser.y" /* yacc.c:1646  */
+  case 178:
+#line 271 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2214,11 +2233,11 @@ yyreduce:
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2218 "util/configparser.c" /* yacc.c:1646  */
+#line 2237 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 175:
-#line 275 "./util/configparser.y" /* yacc.c:1646  */
+  case 179:
+#line 280 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2226,11 +2245,11 @@ yyreduce:
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2230 "util/configparser.c" /* yacc.c:1646  */
+#line 2249 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 176:
-#line 284 "./util/configparser.y" /* yacc.c:1646  */
+  case 180:
+#line 289 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
@@ -2240,11 +2259,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2244 "util/configparser.c" /* yacc.c:1646  */
+#line 2263 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 177:
-#line 295 "./util/configparser.y" /* yacc.c:1646  */
+  case 181:
+#line 300 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2252,11 +2271,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2256 "util/configparser.c" /* yacc.c:1646  */
+#line 2275 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 178:
-#line 304 "./util/configparser.y" /* yacc.c:1646  */
+  case 182:
+#line 309 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2264,11 +2283,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2268 "util/configparser.c" /* yacc.c:1646  */
+#line 2287 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 179:
-#line 313 "./util/configparser.y" /* yacc.c:1646  */
+  case 183:
+#line 318 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2276,11 +2295,11 @@ yyreduce:
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2280 "util/configparser.c" /* yacc.c:1646  */
+#line 2299 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 180:
-#line 322 "./util/configparser.y" /* yacc.c:1646  */
+  case 184:
+#line 327 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_ifs == 0)
@@ -2292,11 +2311,11 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 2296 "util/configparser.c" /* yacc.c:1646  */
+#line 2315 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 181:
-#line 335 "./util/configparser.y" /* yacc.c:1646  */
+  case 185:
+#line 340 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_out_ifs == 0)
@@ -2310,11 +2329,11 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 2314 "util/configparser.c" /* yacc.c:1646  */
+#line 2333 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 182:
-#line 350 "./util/configparser.y" /* yacc.c:1646  */
+  case 186:
+#line 355 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2322,11 +2341,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2326 "util/configparser.c" /* yacc.c:1646  */
+#line 2345 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 183:
-#line 359 "./util/configparser.y" /* yacc.c:1646  */
+  case 187:
+#line 364 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 1, 
@@ -2334,11 +2353,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 2338 "util/configparser.c" /* yacc.c:1646  */
+#line 2357 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 184:
-#line 368 "./util/configparser.y" /* yacc.c:1646  */
+  case 188:
+#line 373 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 0, 
@@ -2346,11 +2365,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 2350 "util/configparser.c" /* yacc.c:1646  */
+#line 2369 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 185:
-#line 377 "./util/configparser.y" /* yacc.c:1646  */
+  case 189:
+#line 382 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2358,11 +2377,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2362 "util/configparser.c" /* yacc.c:1646  */
+#line 2381 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 186:
-#line 386 "./util/configparser.y" /* yacc.c:1646  */
+  case 190:
+#line 391 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2370,11 +2389,11 @@ yyreduce:
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2374 "util/configparser.c" /* yacc.c:1646  */
+#line 2393 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 187:
-#line 395 "./util/configparser.y" /* yacc.c:1646  */
+  case 191:
+#line 400 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2382,11 +2401,11 @@ yyreduce:
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2386 "util/configparser.c" /* yacc.c:1646  */
+#line 2405 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 188:
-#line 404 "./util/configparser.y" /* yacc.c:1646  */
+  case 192:
+#line 409 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2394,11 +2413,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2398 "util/configparser.c" /* yacc.c:1646  */
+#line 2417 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 189:
-#line 413 "./util/configparser.y" /* yacc.c:1646  */
+  case 193:
+#line 418 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2406,11 +2425,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2410 "util/configparser.c" /* yacc.c:1646  */
+#line 2429 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 190:
-#line 422 "./util/configparser.y" /* yacc.c:1646  */
+  case 194:
+#line 427 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2418,11 +2437,11 @@ yyreduce:
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2422 "util/configparser.c" /* yacc.c:1646  */
+#line 2441 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 191:
-#line 431 "./util/configparser.y" /* yacc.c:1646  */
+  case 195:
+#line 436 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2430,11 +2449,11 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2434 "util/configparser.c" /* yacc.c:1646  */
+#line 2453 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 192:
-#line 440 "./util/configparser.y" /* yacc.c:1646  */
+  case 196:
+#line 445 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2442,11 +2461,11 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2446 "util/configparser.c" /* yacc.c:1646  */
+#line 2465 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 193:
-#line 449 "./util/configparser.y" /* yacc.c:1646  */
+  case 197:
+#line 454 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
                 if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2454,11 +2473,11 @@ yyreduce:
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
 	}
-#line 2458 "util/configparser.c" /* yacc.c:1646  */
+#line 2477 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 194:
-#line 458 "./util/configparser.y" /* yacc.c:1646  */
+  case 198:
+#line 463 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2466,11 +2485,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2470 "util/configparser.c" /* yacc.c:1646  */
+#line 2489 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 195:
-#line 467 "./util/configparser.y" /* yacc.c:1646  */
+  case 199:
+#line 472 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2478,11 +2497,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2482 "util/configparser.c" /* yacc.c:1646  */
+#line 2501 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 196:
-#line 476 "./util/configparser.y" /* yacc.c:1646  */
+  case 200:
+#line 481 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2490,31 +2509,31 @@ yyreduce:
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2494 "util/configparser.c" /* yacc.c:1646  */
+#line 2513 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 197:
-#line 485 "./util/configparser.y" /* yacc.c:1646  */
+  case 201:
+#line 490 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_key);
 		cfg_parser->cfg->ssl_service_key = (yyvsp[0].str);
 	}
-#line 2504 "util/configparser.c" /* yacc.c:1646  */
+#line 2523 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 198:
-#line 492 "./util/configparser.y" /* yacc.c:1646  */
+  case 202:
+#line 497 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_pem);
 		cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str);
 	}
-#line 2514 "util/configparser.c" /* yacc.c:1646  */
+#line 2533 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 199:
-#line 499 "./util/configparser.y" /* yacc.c:1646  */
+  case 203:
+#line 504 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2522,11 +2541,11 @@ yyreduce:
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2526 "util/configparser.c" /* yacc.c:1646  */
+#line 2545 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 200:
-#line 508 "./util/configparser.y" /* yacc.c:1646  */
+  case 204:
+#line 513 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2534,11 +2553,11 @@ yyreduce:
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2538 "util/configparser.c" /* yacc.c:1646  */
+#line 2557 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 201:
-#line 517 "./util/configparser.y" /* yacc.c:1646  */
+  case 205:
+#line 522 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2546,11 +2565,11 @@ yyreduce:
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2550 "util/configparser.c" /* yacc.c:1646  */
+#line 2569 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 202:
-#line 526 "./util/configparser.y" /* yacc.c:1646  */
+  case 206:
+#line 531 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2563,11 +2582,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 2567 "util/configparser.c" /* yacc.c:1646  */
+#line 2586 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 203:
-#line 540 "./util/configparser.y" /* yacc.c:1646  */
+  case 207:
+#line 545 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2575,11 +2594,11 @@ yyreduce:
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2579 "util/configparser.c" /* yacc.c:1646  */
+#line 2598 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 204:
-#line 549 "./util/configparser.y" /* yacc.c:1646  */
+  case 208:
+#line 554 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2587,11 +2606,11 @@ yyreduce:
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2591 "util/configparser.c" /* yacc.c:1646  */
+#line 2610 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 205:
-#line 558 "./util/configparser.y" /* yacc.c:1646  */
+  case 209:
+#line 563 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2599,31 +2618,31 @@ yyreduce:
   	else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 2603 "util/configparser.c" /* yacc.c:1646  */
+#line 2622 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 206:
-#line 567 "./util/configparser.y" /* yacc.c:1646  */
+  case 210:
+#line 572 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->chrootdir);
 		cfg_parser->cfg->chrootdir = (yyvsp[0].str);
 	}
-#line 2613 "util/configparser.c" /* yacc.c:1646  */
+#line 2632 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 207:
-#line 574 "./util/configparser.y" /* yacc.c:1646  */
+  case 211:
+#line 579 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_username:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->username);
 		cfg_parser->cfg->username = (yyvsp[0].str);
 	}
-#line 2623 "util/configparser.c" /* yacc.c:1646  */
+#line 2642 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 208:
-#line 581 "./util/configparser.y" /* yacc.c:1646  */
+  case 212:
+#line 586 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->directory);
@@ -2648,115 +2667,115 @@ yyreduce:
 			}
 		}
 	}
-#line 2652 "util/configparser.c" /* yacc.c:1646  */
+#line 2671 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 209:
-#line 607 "./util/configparser.y" /* yacc.c:1646  */
+  case 213:
+#line 612 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->logfile);
 		cfg_parser->cfg->logfile = (yyvsp[0].str);
 		cfg_parser->cfg->use_syslog = 0;
 	}
-#line 2663 "util/configparser.c" /* yacc.c:1646  */
+#line 2682 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 210:
-#line 615 "./util/configparser.y" /* yacc.c:1646  */
+  case 214:
+#line 620 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->pidfile);
 		cfg_parser->cfg->pidfile = (yyvsp[0].str);
 	}
-#line 2673 "util/configparser.c" /* yacc.c:1646  */
+#line 2692 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 211:
-#line 622 "./util/configparser.y" /* yacc.c:1646  */
+  case 215:
+#line 627 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 2683 "util/configparser.c" /* yacc.c:1646  */
+#line 2702 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 212:
-#line 629 "./util/configparser.y" /* yacc.c:1646  */
+  case 216:
+#line 634 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dlv_anchor_file);
 		cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str);
 	}
-#line 2693 "util/configparser.c" /* yacc.c:1646  */
+#line 2712 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 213:
-#line 636 "./util/configparser.y" /* yacc.c:1646  */
+  case 217:
+#line 641 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 2703 "util/configparser.c" /* yacc.c:1646  */
+#line 2722 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 214:
-#line 643 "./util/configparser.y" /* yacc.c:1646  */
+  case 218:
+#line 648 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			auto_trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 2714 "util/configparser.c" /* yacc.c:1646  */
+#line 2733 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 215:
-#line 651 "./util/configparser.y" /* yacc.c:1646  */
+  case 219:
+#line 656 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 2725 "util/configparser.c" /* yacc.c:1646  */
+#line 2744 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 216:
-#line 659 "./util/configparser.y" /* yacc.c:1646  */
+  case 220:
+#line 664 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trusted_keys_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 2736 "util/configparser.c" /* yacc.c:1646  */
+#line 2755 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 217:
-#line 667 "./util/configparser.y" /* yacc.c:1646  */
+  case 221:
+#line 672 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 2746 "util/configparser.c" /* yacc.c:1646  */
+#line 2765 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 218:
-#line 674 "./util/configparser.y" /* yacc.c:1646  */
+  case 222:
+#line 679 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 2756 "util/configparser.c" /* yacc.c:1646  */
+#line 2775 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 219:
-#line 681 "./util/configparser.y" /* yacc.c:1646  */
+  case 223:
+#line 686 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2764,11 +2783,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2768 "util/configparser.c" /* yacc.c:1646  */
+#line 2787 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 220:
-#line 690 "./util/configparser.y" /* yacc.c:1646  */
+  case 224:
+#line 695 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2776,53 +2795,53 @@ yyreduce:
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2780 "util/configparser.c" /* yacc.c:1646  */
+#line 2799 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 221:
-#line 699 "./util/configparser.y" /* yacc.c:1646  */
+  case 225:
+#line 704 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->identity);
 		cfg_parser->cfg->identity = (yyvsp[0].str);
 	}
-#line 2790 "util/configparser.c" /* yacc.c:1646  */
+#line 2809 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 222:
-#line 706 "./util/configparser.y" /* yacc.c:1646  */
+  case 226:
+#line 711 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->version);
 		cfg_parser->cfg->version = (yyvsp[0].str);
 	}
-#line 2800 "util/configparser.c" /* yacc.c:1646  */
+#line 2819 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 223:
-#line 713 "./util/configparser.y" /* yacc.c:1646  */
+  case 227:
+#line 718 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 2811 "util/configparser.c" /* yacc.c:1646  */
+#line 2830 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 224:
-#line 721 "./util/configparser.y" /* yacc.c:1646  */
+  case 228:
+#line 726 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 2822 "util/configparser.c" /* yacc.c:1646  */
+#line 2841 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 225:
-#line 729 "./util/configparser.y" /* yacc.c:1646  */
+  case 229:
+#line 734 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2831,11 +2850,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 2835 "util/configparser.c" /* yacc.c:1646  */
+#line 2854 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 226:
-#line 739 "./util/configparser.y" /* yacc.c:1646  */
+  case 230:
+#line 744 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2844,11 +2863,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 2848 "util/configparser.c" /* yacc.c:1646  */
+#line 2867 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 227:
-#line 749 "./util/configparser.y" /* yacc.c:1646  */
+  case 231:
+#line 754 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2857,11 +2876,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 2861 "util/configparser.c" /* yacc.c:1646  */
+#line 2880 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 228:
-#line 759 "./util/configparser.y" /* yacc.c:1646  */
+  case 232:
+#line 764 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2873,11 +2892,11 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2877 "util/configparser.c" /* yacc.c:1646  */
+#line 2896 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 229:
-#line 772 "./util/configparser.y" /* yacc.c:1646  */
+  case 233:
+#line 777 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2887,22 +2906,22 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2891 "util/configparser.c" /* yacc.c:1646  */
+#line 2910 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 230:
-#line 783 "./util/configparser.y" /* yacc.c:1646  */
+  case 234:
+#line 788 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 2902 "util/configparser.c" /* yacc.c:1646  */
+#line 2921 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 231:
-#line 791 "./util/configparser.y" /* yacc.c:1646  */
+  case 235:
+#line 796 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2914,11 +2933,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 2918 "util/configparser.c" /* yacc.c:1646  */
+#line 2937 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 232:
-#line 804 "./util/configparser.y" /* yacc.c:1646  */
+  case 236:
+#line 809 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2926,11 +2945,11 @@ yyreduce:
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2930 "util/configparser.c" /* yacc.c:1646  */
+#line 2949 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 233:
-#line 813 "./util/configparser.y" /* yacc.c:1646  */
+  case 237:
+#line 818 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2938,11 +2957,11 @@ yyreduce:
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2942 "util/configparser.c" /* yacc.c:1646  */
+#line 2961 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 234:
-#line 822 "./util/configparser.y" /* yacc.c:1646  */
+  case 238:
+#line 827 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2950,11 +2969,11 @@ yyreduce:
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2954 "util/configparser.c" /* yacc.c:1646  */
+#line 2973 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 235:
-#line 831 "./util/configparser.y" /* yacc.c:1646  */
+  case 239:
+#line 836 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2963,11 +2982,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2967 "util/configparser.c" /* yacc.c:1646  */
+#line 2986 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 236:
-#line 841 "./util/configparser.y" /* yacc.c:1646  */
+  case 240:
+#line 846 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2976,22 +2995,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2980 "util/configparser.c" /* yacc.c:1646  */
+#line 2999 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 237:
-#line 851 "./util/configparser.y" /* yacc.c:1646  */
+  case 241:
+#line 856 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 2991 "util/configparser.c" /* yacc.c:1646  */
+#line 3010 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 238:
-#line 859 "./util/configparser.y" /* yacc.c:1646  */
+  case 242:
+#line 864 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3003,11 +3022,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3007 "util/configparser.c" /* yacc.c:1646  */
+#line 3026 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 239:
-#line 872 "./util/configparser.y" /* yacc.c:1646  */
+  case 243:
+#line 877 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3015,22 +3034,22 @@ yyreduce:
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3019 "util/configparser.c" /* yacc.c:1646  */
+#line 3038 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 240:
-#line 881 "./util/configparser.y" /* yacc.c:1646  */
+  case 244:
+#line 886 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
 			"removed, use infra-host-ttl)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3030 "util/configparser.c" /* yacc.c:1646  */
+#line 3049 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 241:
-#line 889 "./util/configparser.y" /* yacc.c:1646  */
+  case 245:
+#line 894 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3038,22 +3057,22 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3042 "util/configparser.c" /* yacc.c:1646  */
+#line 3061 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 242:
-#line 898 "./util/configparser.y" /* yacc.c:1646  */
+  case 246:
+#line 903 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
 			"(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3053 "util/configparser.c" /* yacc.c:1646  */
+#line 3072 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 243:
-#line 906 "./util/configparser.y" /* yacc.c:1646  */
+  case 247:
+#line 911 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3065,11 +3084,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3069 "util/configparser.c" /* yacc.c:1646  */
+#line 3088 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 244:
-#line 919 "./util/configparser.y" /* yacc.c:1646  */
+  case 248:
+#line 924 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3077,21 +3096,21 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3081 "util/configparser.c" /* yacc.c:1646  */
+#line 3100 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 245:
-#line 928 "./util/configparser.y" /* yacc.c:1646  */
+  case 249:
+#line 933 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->target_fetch_policy);
 		cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
 	}
-#line 3091 "util/configparser.c" /* yacc.c:1646  */
+#line 3110 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 246:
-#line 935 "./util/configparser.y" /* yacc.c:1646  */
+  case 250:
+#line 940 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3100,11 +3119,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3104 "util/configparser.c" /* yacc.c:1646  */
+#line 3123 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 247:
-#line 945 "./util/configparser.y" /* yacc.c:1646  */
+  case 251:
+#line 950 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3113,11 +3132,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3117 "util/configparser.c" /* yacc.c:1646  */
+#line 3136 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 248:
-#line 955 "./util/configparser.y" /* yacc.c:1646  */
+  case 252:
+#line 960 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3126,11 +3145,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3130 "util/configparser.c" /* yacc.c:1646  */
+#line 3149 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 249:
-#line 965 "./util/configparser.y" /* yacc.c:1646  */
+  case 253:
+#line 970 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3139,11 +3158,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3143 "util/configparser.c" /* yacc.c:1646  */
+#line 3162 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 250:
-#line 975 "./util/configparser.y" /* yacc.c:1646  */
+  case 254:
+#line 980 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3152,11 +3171,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3156 "util/configparser.c" /* yacc.c:1646  */
+#line 3175 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 251:
-#line 985 "./util/configparser.y" /* yacc.c:1646  */
+  case 255:
+#line 990 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3165,11 +3184,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3169 "util/configparser.c" /* yacc.c:1646  */
+#line 3188 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 252:
-#line 995 "./util/configparser.y" /* yacc.c:1646  */
+  case 256:
+#line 1000 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3178,11 +3197,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3182 "util/configparser.c" /* yacc.c:1646  */
+#line 3201 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 253:
-#line 1005 "./util/configparser.y" /* yacc.c:1646  */
+  case 257:
+#line 1010 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3191,41 +3210,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3195 "util/configparser.c" /* yacc.c:1646  */
+#line 3214 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 254:
-#line 1015 "./util/configparser.y" /* yacc.c:1646  */
+  case 258:
+#line 1020 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3205 "util/configparser.c" /* yacc.c:1646  */
+#line 3224 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 255:
-#line 1022 "./util/configparser.y" /* yacc.c:1646  */
+  case 259:
+#line 1027 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3215 "util/configparser.c" /* yacc.c:1646  */
+#line 3234 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 256:
-#line 1029 "./util/configparser.y" /* yacc.c:1646  */
+  case 260:
+#line 1034 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3225 "util/configparser.c" /* yacc.c:1646  */
+#line 3244 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 257:
-#line 1036 "./util/configparser.y" /* yacc.c:1646  */
+  case 261:
+#line 1041 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3233,11 +3252,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3237 "util/configparser.c" /* yacc.c:1646  */
+#line 3256 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 258:
-#line 1045 "./util/configparser.y" /* yacc.c:1646  */
+  case 262:
+#line 1050 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3245,11 +3264,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3249 "util/configparser.c" /* yacc.c:1646  */
+#line 3268 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 259:
-#line 1054 "./util/configparser.y" /* yacc.c:1646  */
+  case 263:
+#line 1059 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3257,21 +3276,21 @@ yyreduce:
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3261 "util/configparser.c" /* yacc.c:1646  */
+#line 3280 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 260:
-#line 1063 "./util/configparser.y" /* yacc.c:1646  */
+  case 264:
+#line 1068 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3271 "util/configparser.c" /* yacc.c:1646  */
+#line 3290 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 261:
-#line 1070 "./util/configparser.y" /* yacc.c:1646  */
+  case 265:
+#line 1075 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3280,11 +3299,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3284 "util/configparser.c" /* yacc.c:1646  */
+#line 3303 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 262:
-#line 1080 "./util/configparser.y" /* yacc.c:1646  */
+  case 266:
+#line 1085 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 &&
@@ -3300,21 +3319,21 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 3304 "util/configparser.c" /* yacc.c:1646  */
+#line 3323 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 263:
-#line 1097 "./util/configparser.y" /* yacc.c:1646  */
+  case 267:
+#line 1102 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->module_conf);
 		cfg_parser->cfg->module_conf = (yyvsp[0].str);
 	}
-#line 3314 "util/configparser.c" /* yacc.c:1646  */
+#line 3333 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 264:
-#line 1104 "./util/configparser.y" /* yacc.c:1646  */
+  case 268:
+#line 1109 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -3331,11 +3350,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3335 "util/configparser.c" /* yacc.c:1646  */
+#line 3354 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 265:
-#line 1122 "./util/configparser.y" /* yacc.c:1646  */
+  case 269:
+#line 1127 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -3347,11 +3366,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3351 "util/configparser.c" /* yacc.c:1646  */
+#line 3370 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 266:
-#line 1135 "./util/configparser.y" /* yacc.c:1646  */
+  case 270:
+#line 1140 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -3363,11 +3382,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3367 "util/configparser.c" /* yacc.c:1646  */
+#line 3386 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 267:
-#line 1148 "./util/configparser.y" /* yacc.c:1646  */
+  case 271:
+#line 1153 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3375,11 +3394,11 @@ yyreduce:
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3379 "util/configparser.c" /* yacc.c:1646  */
+#line 3398 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 268:
-#line 1157 "./util/configparser.y" /* yacc.c:1646  */
+  case 272:
+#line 1162 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3387,11 +3406,11 @@ yyreduce:
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3391 "util/configparser.c" /* yacc.c:1646  */
+#line 3410 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 269:
-#line 1166 "./util/configparser.y" /* yacc.c:1646  */
+  case 273:
+#line 1171 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3399,11 +3418,11 @@ yyreduce:
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3403 "util/configparser.c" /* yacc.c:1646  */
+#line 3422 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 270:
-#line 1175 "./util/configparser.y" /* yacc.c:1646  */
+  case 274:
+#line 1180 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3411,11 +3430,11 @@ yyreduce:
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3415 "util/configparser.c" /* yacc.c:1646  */
+#line 3434 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 271:
-#line 1184 "./util/configparser.y" /* yacc.c:1646  */
+  case 275:
+#line 1189 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3424,11 +3443,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3428 "util/configparser.c" /* yacc.c:1646  */
+#line 3447 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 272:
-#line 1194 "./util/configparser.y" /* yacc.c:1646  */
+  case 276:
+#line 1199 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3437,11 +3456,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3441 "util/configparser.c" /* yacc.c:1646  */
+#line 3460 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 273:
-#line 1204 "./util/configparser.y" /* yacc.c:1646  */
+  case 277:
+#line 1209 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3449,11 +3468,11 @@ yyreduce:
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3453 "util/configparser.c" /* yacc.c:1646  */
+#line 3472 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 274:
-#line 1213 "./util/configparser.y" /* yacc.c:1646  */
+  case 278:
+#line 1218 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3461,11 +3480,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3465 "util/configparser.c" /* yacc.c:1646  */
+#line 3484 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 275:
-#line 1222 "./util/configparser.y" /* yacc.c:1646  */
+  case 279:
+#line 1227 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3477,11 +3496,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3481 "util/configparser.c" /* yacc.c:1646  */
+#line 3500 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 276:
-#line 1235 "./util/configparser.y" /* yacc.c:1646  */
+  case 280:
+#line 1240 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3489,21 +3508,21 @@ yyreduce:
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3493 "util/configparser.c" /* yacc.c:1646  */
+#line 3512 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 277:
-#line 1244 "./util/configparser.y" /* yacc.c:1646  */
+  case 281:
+#line 1249 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->val_nsec3_key_iterations);
 		cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
 	}
-#line 3503 "util/configparser.c" /* yacc.c:1646  */
+#line 3522 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 278:
-#line 1251 "./util/configparser.y" /* yacc.c:1646  */
+  case 282:
+#line 1256 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3511,11 +3530,11 @@ yyreduce:
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3515 "util/configparser.c" /* yacc.c:1646  */
+#line 3534 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 279:
-#line 1260 "./util/configparser.y" /* yacc.c:1646  */
+  case 283:
+#line 1265 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3523,11 +3542,11 @@ yyreduce:
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3527 "util/configparser.c" /* yacc.c:1646  */
+#line 3546 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 280:
-#line 1269 "./util/configparser.y" /* yacc.c:1646  */
+  case 284:
+#line 1274 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3535,11 +3554,11 @@ yyreduce:
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3539 "util/configparser.c" /* yacc.c:1646  */
+#line 3558 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 281:
-#line 1278 "./util/configparser.y" /* yacc.c:1646  */
+  case 285:
+#line 1283 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3548,22 +3567,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3552 "util/configparser.c" /* yacc.c:1646  */
+#line 3571 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 282:
-#line 1287 "./util/configparser.y" /* yacc.c:1646  */
+  case 286:
+#line 1292 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3563 "util/configparser.c" /* yacc.c:1646  */
+#line 3582 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 283:
-#line 1295 "./util/configparser.y" /* yacc.c:1646  */
+  case 287:
+#line 1300 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3575,22 +3594,22 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3579 "util/configparser.c" /* yacc.c:1646  */
+#line 3598 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 284:
-#line 1308 "./util/configparser.y" /* yacc.c:1646  */
+  case 288:
+#line 1313 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3590 "util/configparser.c" /* yacc.c:1646  */
+#line 3609 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 285:
-#line 1316 "./util/configparser.y" /* yacc.c:1646  */
+  case 289:
+#line 1321 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -3617,21 +3636,21 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 3621 "util/configparser.c" /* yacc.c:1646  */
+#line 3640 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 286:
-#line 1344 "./util/configparser.y" /* yacc.c:1646  */
+  case 290:
+#line 1349 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
 			fatal_exit("out of memory adding local-data");
 	}
-#line 3631 "util/configparser.c" /* yacc.c:1646  */
+#line 3650 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 287:
-#line 1351 "./util/configparser.y" /* yacc.c:1646  */
+  case 291:
+#line 1356 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -3645,11 +3664,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 3649 "util/configparser.c" /* yacc.c:1646  */
+#line 3668 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 288:
-#line 1366 "./util/configparser.y" /* yacc.c:1646  */
+  case 292:
+#line 1371 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3658,11 +3677,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3662 "util/configparser.c" /* yacc.c:1646  */
+#line 3681 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 289:
-#line 1376 "./util/configparser.y" /* yacc.c:1646  */
+  case 293:
+#line 1381 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3671,31 +3690,31 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3675 "util/configparser.c" /* yacc.c:1646  */
+#line 3694 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 290:
-#line 1386 "./util/configparser.y" /* yacc.c:1646  */
+  case 294:
+#line 1391 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3685 "util/configparser.c" /* yacc.c:1646  */
+#line 3704 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 291:
-#line 1393 "./util/configparser.y" /* yacc.c:1646  */
+  case 295:
+#line 1398 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dns64_prefix);
 		cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
 	}
-#line 3695 "util/configparser.c" /* yacc.c:1646  */
+#line 3714 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 292:
-#line 1400 "./util/configparser.y" /* yacc.c:1646  */
+  case 296:
+#line 1405 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3703,11 +3722,11 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3707 "util/configparser.c" /* yacc.c:1646  */
+#line 3726 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 293:
-#line 1409 "./util/configparser.y" /* yacc.c:1646  */
+  case 297:
+#line 1414 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -3720,11 +3739,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3724 "util/configparser.c" /* yacc.c:1646  */
+#line 3743 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 294:
-#line 1423 "./util/configparser.y" /* yacc.c:1646  */
+  case 298:
+#line 1428 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -3742,11 +3761,11 @@ yyreduce:
 			}
 		}
 	}
-#line 3746 "util/configparser.c" /* yacc.c:1646  */
+#line 3765 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 295:
-#line 1442 "./util/configparser.y" /* yacc.c:1646  */
+  case 299:
+#line 1447 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -3764,11 +3783,11 @@ yyreduce:
 			}
 		}
 	}
-#line 3768 "util/configparser.c" /* yacc.c:1646  */
+#line 3787 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 296:
-#line 1461 "./util/configparser.y" /* yacc.c:1646  */
+  case 300:
+#line 1466 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
@@ -3779,11 +3798,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 3783 "util/configparser.c" /* yacc.c:1646  */
+#line 3802 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 297:
-#line 1473 "./util/configparser.y" /* yacc.c:1646  */
+  case 301:
+#line 1478 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
@@ -3794,11 +3813,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 3798 "util/configparser.c" /* yacc.c:1646  */
+#line 3817 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 298:
-#line 1485 "./util/configparser.y" /* yacc.c:1646  */
+  case 302:
+#line 1490 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
@@ -3809,11 +3828,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 3813 "util/configparser.c" /* yacc.c:1646  */
+#line 3832 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 299:
-#line 1497 "./util/configparser.y" /* yacc.c:1646  */
+  case 303:
+#line 1502 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
@@ -3823,11 +3842,23 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 3827 "util/configparser.c" /* yacc.c:1646  */
+#line 3846 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 300:
-#line 1508 "./util/configparser.y" /* yacc.c:1646  */
+  case 304:
+#line 1513 "./util/configparser.y" /* yacc.c:1646  */
+    { 
+		OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); 
+		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
+		free((yyvsp[0].str));
+	}
+#line 3858 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 305:
+#line 1523 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3835,22 +3866,49 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3839 "util/configparser.c" /* yacc.c:1646  */
+#line 3870 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 301:
-#line 1517 "./util/configparser.y" /* yacc.c:1646  */
+  case 306:
+#line 1532 "./util/configparser.y" /* yacc.c:1646  */
+    {
+  	OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
+  	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size))
+  		yyerror("memory size expected");
+  	free((yyvsp[0].str));
+  }
+#line 3881 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 307:
+#line 1540 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3850 "util/configparser.c" /* yacc.c:1646  */
+#line 3892 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 302:
-#line 1525 "./util/configparser.y" /* yacc.c:1646  */
+  case 308:
+#line 1548 "./util/configparser.y" /* yacc.c:1646  */
+    {
+  	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
+  	if(atoi((yyvsp[0].str)) == 0)
+  		yyerror("number expected");
+  	else {
+  		cfg_parser->cfg->ip_ratelimit_slabs = atoi((yyvsp[0].str));
+  		if(!is_pow2(cfg_parser->cfg->ip_ratelimit_slabs))
+  			yyerror("must be a power of 2");
+  	}
+  	free((yyvsp[0].str));
+  }
+#line 3908 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 309:
+#line 1561 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3862,11 +3920,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3866 "util/configparser.c" /* yacc.c:1646  */
+#line 3924 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 303:
-#line 1538 "./util/configparser.y" /* yacc.c:1646  */
+  case 310:
+#line 1574 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -3878,11 +3936,11 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 3882 "util/configparser.c" /* yacc.c:1646  */
+#line 3940 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 304:
-#line 1551 "./util/configparser.y" /* yacc.c:1646  */
+  case 311:
+#line 1587 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -3894,11 +3952,23 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 3898 "util/configparser.c" /* yacc.c:1646  */
+#line 3956 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 305:
-#line 1564 "./util/configparser.y" /* yacc.c:1646  */
+  case 312:
+#line 1600 "./util/configparser.y" /* yacc.c:1646  */
+    { 
+  	OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
+  	if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
+  		yyerror("number expected");
+  	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
+  	free((yyvsp[0].str));
+	}
+#line 3968 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 313:
+#line 1609 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3906,11 +3976,11 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3910 "util/configparser.c" /* yacc.c:1646  */
+#line 3980 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 306:
-#line 1573 "./util/configparser.y" /* yacc.c:1646  */
+  case 314:
+#line 1618 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3919,11 +3989,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3923 "util/configparser.c" /* yacc.c:1646  */
+#line 3993 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 307:
-#line 1583 "./util/configparser.y" /* yacc.c:1646  */
+  case 315:
+#line 1628 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3932,11 +4002,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3936 "util/configparser.c" /* yacc.c:1646  */
+#line 4006 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 308:
-#line 1593 "./util/configparser.y" /* yacc.c:1646  */
+  case 316:
+#line 1638 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -3945,31 +4015,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 3949 "util/configparser.c" /* yacc.c:1646  */
+#line 4019 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 309:
-#line 1603 "./util/configparser.y" /* yacc.c:1646  */
+  case 317:
+#line 1648 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3959 "util/configparser.c" /* yacc.c:1646  */
+#line 4029 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 310:
-#line 1610 "./util/configparser.y" /* yacc.c:1646  */
+  case 318:
+#line 1655 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3969 "util/configparser.c" /* yacc.c:1646  */
+#line 4039 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 311:
-#line 1617 "./util/configparser.y" /* yacc.c:1646  */
+  case 319:
+#line 1662 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3977,11 +4047,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3981 "util/configparser.c" /* yacc.c:1646  */
+#line 4051 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 312:
-#line 1626 "./util/configparser.y" /* yacc.c:1646  */
+  case 320:
+#line 1671 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3990,11 +4060,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3994 "util/configparser.c" /* yacc.c:1646  */
+#line 4064 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 313:
-#line 1636 "./util/configparser.y" /* yacc.c:1646  */
+  case 321:
+#line 1681 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4003,11 +4073,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4007 "util/configparser.c" /* yacc.c:1646  */
+#line 4077 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 314:
-#line 1646 "./util/configparser.y" /* yacc.c:1646  */
+  case 322:
+#line 1691 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -4016,31 +4086,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 4020 "util/configparser.c" /* yacc.c:1646  */
+#line 4090 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 315:
-#line 1656 "./util/configparser.y" /* yacc.c:1646  */
+  case 323:
+#line 1701 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4030 "util/configparser.c" /* yacc.c:1646  */
+#line 4100 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 316:
-#line 1663 "./util/configparser.y" /* yacc.c:1646  */
+  case 324:
+#line 1708 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4040 "util/configparser.c" /* yacc.c:1646  */
+#line 4110 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 317:
-#line 1670 "./util/configparser.y" /* yacc.c:1646  */
+  case 325:
+#line 1715 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4048,11 +4118,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4052 "util/configparser.c" /* yacc.c:1646  */
+#line 4122 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 318:
-#line 1679 "./util/configparser.y" /* yacc.c:1646  */
+  case 326:
+#line 1724 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4061,11 +4131,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4065 "util/configparser.c" /* yacc.c:1646  */
+#line 4135 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 319:
-#line 1689 "./util/configparser.y" /* yacc.c:1646  */
+  case 327:
+#line 1734 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -4074,11 +4144,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 4078 "util/configparser.c" /* yacc.c:1646  */
+#line 4148 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 320:
-#line 1699 "./util/configparser.y" /* yacc.c:1646  */
+  case 328:
+#line 1744 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -4106,11 +4176,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 4110 "util/configparser.c" /* yacc.c:1646  */
+#line 4180 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 321:
-#line 1728 "./util/configparser.y" /* yacc.c:1646  */
+  case 329:
+#line 1773 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
@@ -4118,11 +4188,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 4122 "util/configparser.c" /* yacc.c:1646  */
+#line 4192 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 322:
-#line 1737 "./util/configparser.y" /* yacc.c:1646  */
+  case 330:
+#line 1782 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4130,19 +4200,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4134 "util/configparser.c" /* yacc.c:1646  */
+#line 4204 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 323:
-#line 1746 "./util/configparser.y" /* yacc.c:1646  */
+  case 331:
+#line 1791 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 4142 "util/configparser.c" /* yacc.c:1646  */
+#line 4212 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 334:
-#line 1757 "./util/configparser.y" /* yacc.c:1646  */
+  case 342:
+#line 1802 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4151,11 +4221,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4155 "util/configparser.c" /* yacc.c:1646  */
+#line 4225 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 335:
-#line 1767 "./util/configparser.y" /* yacc.c:1646  */
+  case 343:
+#line 1812 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4163,21 +4233,21 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4167 "util/configparser.c" /* yacc.c:1646  */
+#line 4237 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 336:
-#line 1776 "./util/configparser.y" /* yacc.c:1646  */
+  case 344:
+#line 1821 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4177 "util/configparser.c" /* yacc.c:1646  */
+#line 4247 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 337:
-#line 1783 "./util/configparser.y" /* yacc.c:1646  */
+  case 345:
+#line 1828 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4186,122 +4256,122 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4190 "util/configparser.c" /* yacc.c:1646  */
+#line 4260 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 338:
-#line 1793 "./util/configparser.y" /* yacc.c:1646  */
+  case 346:
+#line 1838 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_key_file);
 		cfg_parser->cfg->server_key_file = (yyvsp[0].str);
 	}
-#line 4200 "util/configparser.c" /* yacc.c:1646  */
+#line 4270 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 339:
-#line 1800 "./util/configparser.y" /* yacc.c:1646  */
+  case 347:
+#line 1845 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_cert_file);
 		cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
 	}
-#line 4210 "util/configparser.c" /* yacc.c:1646  */
+#line 4280 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 340:
-#line 1807 "./util/configparser.y" /* yacc.c:1646  */
+  case 348:
+#line 1852 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_key_file);
 		cfg_parser->cfg->control_key_file = (yyvsp[0].str);
 	}
-#line 4220 "util/configparser.c" /* yacc.c:1646  */
+#line 4290 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 341:
-#line 1814 "./util/configparser.y" /* yacc.c:1646  */
+  case 349:
+#line 1859 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_cert_file);
 		cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
 	}
-#line 4230 "util/configparser.c" /* yacc.c:1646  */
+#line 4300 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 342:
-#line 1821 "./util/configparser.y" /* yacc.c:1646  */
+  case 350:
+#line 1866 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 4238 "util/configparser.c" /* yacc.c:1646  */
+#line 4308 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 357:
-#line 1838 "./util/configparser.y" /* yacc.c:1646  */
+  case 365:
+#line 1883 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4249 "util/configparser.c" /* yacc.c:1646  */
+#line 4319 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 358:
-#line 1846 "./util/configparser.y" /* yacc.c:1646  */
+  case 366:
+#line 1891 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_socket_path);
 		cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
 	}
-#line 4259 "util/configparser.c" /* yacc.c:1646  */
+#line 4329 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 359:
-#line 1853 "./util/configparser.y" /* yacc.c:1646  */
+  case 367:
+#line 1898 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4270 "util/configparser.c" /* yacc.c:1646  */
+#line 4340 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 360:
-#line 1861 "./util/configparser.y" /* yacc.c:1646  */
+  case 368:
+#line 1906 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4281 "util/configparser.c" /* yacc.c:1646  */
+#line 4351 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 361:
-#line 1869 "./util/configparser.y" /* yacc.c:1646  */
+  case 369:
+#line 1914 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_identity);
 		cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
 	}
-#line 4291 "util/configparser.c" /* yacc.c:1646  */
+#line 4361 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 362:
-#line 1876 "./util/configparser.y" /* yacc.c:1646  */
+  case 370:
+#line 1921 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_version);
 		cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
 	}
-#line 4301 "util/configparser.c" /* yacc.c:1646  */
+#line 4371 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 363:
-#line 1883 "./util/configparser.y" /* yacc.c:1646  */
+  case 371:
+#line 1928 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4309,11 +4379,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_log_resolver_query_messages =
 			(strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4313 "util/configparser.c" /* yacc.c:1646  */
+#line 4383 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 364:
-#line 1892 "./util/configparser.y" /* yacc.c:1646  */
+  case 372:
+#line 1937 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4321,11 +4391,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_log_resolver_response_messages =
 			(strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4325 "util/configparser.c" /* yacc.c:1646  */
+#line 4395 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 365:
-#line 1901 "./util/configparser.y" /* yacc.c:1646  */
+  case 373:
+#line 1946 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4333,11 +4403,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_log_client_query_messages =
 			(strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4337 "util/configparser.c" /* yacc.c:1646  */
+#line 4407 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 366:
-#line 1910 "./util/configparser.y" /* yacc.c:1646  */
+  case 374:
+#line 1955 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4345,11 +4415,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_log_client_response_messages =
 			(strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4349 "util/configparser.c" /* yacc.c:1646  */
+#line 4419 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 367:
-#line 1919 "./util/configparser.y" /* yacc.c:1646  */
+  case 375:
+#line 1964 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4357,11 +4427,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_log_forwarder_query_messages =
 			(strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4361 "util/configparser.c" /* yacc.c:1646  */
+#line 4431 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 368:
-#line 1928 "./util/configparser.y" /* yacc.c:1646  */
+  case 376:
+#line 1973 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4369,29 +4439,29 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_log_forwarder_response_messages =
 			(strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4373 "util/configparser.c" /* yacc.c:1646  */
+#line 4443 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 369:
-#line 1937 "./util/configparser.y" /* yacc.c:1646  */
+  case 377:
+#line 1982 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 4381 "util/configparser.c" /* yacc.c:1646  */
+#line 4451 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 373:
-#line 1946 "./util/configparser.y" /* yacc.c:1646  */
+  case 381:
+#line 1991 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->python_script);
 		cfg_parser->cfg->python_script = (yyvsp[0].str);
 	}
-#line 4391 "util/configparser.c" /* yacc.c:1646  */
+#line 4461 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 374:
-#line 1952 "./util/configparser.y" /* yacc.c:1646  */
+  case 382:
+#line 1997 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
 		if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4400,21 +4470,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4404 "util/configparser.c" /* yacc.c:1646  */
+#line 4474 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 375:
-#line 1962 "./util/configparser.y" /* yacc.c:1646  */
+  case 383:
+#line 2007 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->log_identity);
 		cfg_parser->cfg->log_identity = (yyvsp[0].str);
 	}
-#line 4414 "util/configparser.c" /* yacc.c:1646  */
+#line 4484 "util/configparser.c" /* yacc.c:1646  */
     break;
 
 
-#line 4418 "util/configparser.c" /* yacc.c:1646  */
+#line 4488 "util/configparser.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4642,7 +4712,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 1968 "./util/configparser.y" /* yacc.c:1906  */
+#line 2013 "./util/configparser.y" /* yacc.c:1906  */
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index 4659f6797..1bee06bd7 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -203,31 +203,35 @@ extern int yydebug;
     VAR_HARDEN_ALGO_DOWNGRADE = 413,
     VAR_IP_TRANSPARENT = 414,
     VAR_DISABLE_DNSSEC_LAME_CHECK = 415,
-    VAR_RATELIMIT = 416,
-    VAR_RATELIMIT_SLABS = 417,
-    VAR_RATELIMIT_SIZE = 418,
-    VAR_RATELIMIT_FOR_DOMAIN = 419,
-    VAR_RATELIMIT_BELOW_DOMAIN = 420,
-    VAR_RATELIMIT_FACTOR = 421,
-    VAR_CAPS_WHITELIST = 422,
-    VAR_CACHE_MAX_NEGATIVE_TTL = 423,
-    VAR_PERMIT_SMALL_HOLDDOWN = 424,
-    VAR_QNAME_MINIMISATION = 425,
-    VAR_QNAME_MINIMISATION_STRICT = 426,
-    VAR_IP_FREEBIND = 427,
-    VAR_DEFINE_TAG = 428,
-    VAR_LOCAL_ZONE_TAG = 429,
-    VAR_ACCESS_CONTROL_TAG = 430,
-    VAR_LOCAL_ZONE_OVERRIDE = 431,
-    VAR_ACCESS_CONTROL_TAG_ACTION = 432,
-    VAR_ACCESS_CONTROL_TAG_DATA = 433,
-    VAR_VIEW = 434,
-    VAR_ACCESS_CONTROL_VIEW = 435,
-    VAR_VIEW_FIRST = 436,
-    VAR_SERVE_EXPIRED = 437,
-    VAR_FAKE_DSA = 438,
-    VAR_LOG_IDENTITY = 439,
-    VAR_USE_SYSTEMD = 440
+    VAR_IP_RATELIMIT = 416,
+    VAR_IP_RATELIMIT_SLABS = 417,
+    VAR_IP_RATELIMIT_SIZE = 418,
+    VAR_RATELIMIT = 419,
+    VAR_RATELIMIT_SLABS = 420,
+    VAR_RATELIMIT_SIZE = 421,
+    VAR_RATELIMIT_FOR_DOMAIN = 422,
+    VAR_RATELIMIT_BELOW_DOMAIN = 423,
+    VAR_IP_RATELIMIT_FACTOR = 424,
+    VAR_RATELIMIT_FACTOR = 425,
+    VAR_CAPS_WHITELIST = 426,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 427,
+    VAR_PERMIT_SMALL_HOLDDOWN = 428,
+    VAR_QNAME_MINIMISATION = 429,
+    VAR_QNAME_MINIMISATION_STRICT = 430,
+    VAR_IP_FREEBIND = 431,
+    VAR_DEFINE_TAG = 432,
+    VAR_LOCAL_ZONE_TAG = 433,
+    VAR_ACCESS_CONTROL_TAG = 434,
+    VAR_LOCAL_ZONE_OVERRIDE = 435,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 436,
+    VAR_ACCESS_CONTROL_TAG_DATA = 437,
+    VAR_VIEW = 438,
+    VAR_ACCESS_CONTROL_VIEW = 439,
+    VAR_VIEW_FIRST = 440,
+    VAR_SERVE_EXPIRED = 441,
+    VAR_FAKE_DSA = 442,
+    VAR_LOG_IDENTITY = 443,
+    VAR_USE_SYSTEMD = 444
   };
 #endif
 /* Tokens.  */
@@ -389,31 +393,35 @@ extern int yydebug;
 #define VAR_HARDEN_ALGO_DOWNGRADE 413
 #define VAR_IP_TRANSPARENT 414
 #define VAR_DISABLE_DNSSEC_LAME_CHECK 415
-#define VAR_RATELIMIT 416
-#define VAR_RATELIMIT_SLABS 417
-#define VAR_RATELIMIT_SIZE 418
-#define VAR_RATELIMIT_FOR_DOMAIN 419
-#define VAR_RATELIMIT_BELOW_DOMAIN 420
-#define VAR_RATELIMIT_FACTOR 421
-#define VAR_CAPS_WHITELIST 422
-#define VAR_CACHE_MAX_NEGATIVE_TTL 423
-#define VAR_PERMIT_SMALL_HOLDDOWN 424
-#define VAR_QNAME_MINIMISATION 425
-#define VAR_QNAME_MINIMISATION_STRICT 426
-#define VAR_IP_FREEBIND 427
-#define VAR_DEFINE_TAG 428
-#define VAR_LOCAL_ZONE_TAG 429
-#define VAR_ACCESS_CONTROL_TAG 430
-#define VAR_LOCAL_ZONE_OVERRIDE 431
-#define VAR_ACCESS_CONTROL_TAG_ACTION 432
-#define VAR_ACCESS_CONTROL_TAG_DATA 433
-#define VAR_VIEW 434
-#define VAR_ACCESS_CONTROL_VIEW 435
-#define VAR_VIEW_FIRST 436
-#define VAR_SERVE_EXPIRED 437
-#define VAR_FAKE_DSA 438
-#define VAR_LOG_IDENTITY 439
-#define VAR_USE_SYSTEMD 440
+#define VAR_IP_RATELIMIT 416
+#define VAR_IP_RATELIMIT_SLABS 417
+#define VAR_IP_RATELIMIT_SIZE 418
+#define VAR_RATELIMIT 419
+#define VAR_RATELIMIT_SLABS 420
+#define VAR_RATELIMIT_SIZE 421
+#define VAR_RATELIMIT_FOR_DOMAIN 422
+#define VAR_RATELIMIT_BELOW_DOMAIN 423
+#define VAR_IP_RATELIMIT_FACTOR 424
+#define VAR_RATELIMIT_FACTOR 425
+#define VAR_CAPS_WHITELIST 426
+#define VAR_CACHE_MAX_NEGATIVE_TTL 427
+#define VAR_PERMIT_SMALL_HOLDDOWN 428
+#define VAR_QNAME_MINIMISATION 429
+#define VAR_QNAME_MINIMISATION_STRICT 430
+#define VAR_IP_FREEBIND 431
+#define VAR_DEFINE_TAG 432
+#define VAR_LOCAL_ZONE_TAG 433
+#define VAR_ACCESS_CONTROL_TAG 434
+#define VAR_LOCAL_ZONE_OVERRIDE 435
+#define VAR_ACCESS_CONTROL_TAG_ACTION 436
+#define VAR_ACCESS_CONTROL_TAG_DATA 437
+#define VAR_VIEW 438
+#define VAR_ACCESS_CONTROL_VIEW 439
+#define VAR_VIEW_FIRST 440
+#define VAR_SERVE_EXPIRED 441
+#define VAR_FAKE_DSA 442
+#define VAR_LOG_IDENTITY 443
+#define VAR_USE_SYSTEMD 444
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -424,7 +432,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 428 "util/configparser.h" /* yacc.c:1909  */
+#line 436 "util/configparser.h" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;
diff --git a/util/configparser.y b/util/configparser.y
index 6c3c74da8..e6e3fb474 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -124,8 +124,10 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES
 %token VAR_HARDEN_ALGO_DOWNGRADE VAR_IP_TRANSPARENT
 %token VAR_DISABLE_DNSSEC_LAME_CHECK
+%token VAR_IP_RATELIMIT VAR_IP_RATELIMIT_SLABS VAR_IP_RATELIMIT_SIZE
 %token VAR_RATELIMIT VAR_RATELIMIT_SLABS VAR_RATELIMIT_SIZE
-%token VAR_RATELIMIT_FOR_DOMAIN VAR_RATELIMIT_BELOW_DOMAIN VAR_RATELIMIT_FACTOR
+%token VAR_RATELIMIT_FOR_DOMAIN VAR_RATELIMIT_BELOW_DOMAIN
+%token VAR_IP_RATELIMIT_FACTOR VAR_RATELIMIT_FACTOR
 %token VAR_CAPS_WHITELIST VAR_CACHE_MAX_NEGATIVE_TTL VAR_PERMIT_SMALL_HOLDDOWN
 %token VAR_QNAME_MINIMISATION VAR_QNAME_MINIMISATION_STRICT VAR_IP_FREEBIND
 %token VAR_DEFINE_TAG VAR_LOCAL_ZONE_TAG VAR_ACCESS_CONTROL_TAG
@@ -198,9 +200,12 @@ content_server: server_num_threads | server_verbosity | server_port |
 	server_unblock_lan_zones | server_insecure_lan_zones |
 	server_dns64_prefix | server_dns64_synthall |
 	server_infra_cache_min_rtt | server_harden_algo_downgrade |
-	server_ip_transparent | server_ratelimit | server_ratelimit_slabs |
-	server_ratelimit_size | server_ratelimit_for_domain |
+	server_ip_transparent | server_ip_ratelimit | server_ratelimit |
+	server_ip_ratelimit_slabs | server_ratelimit_slabs |
+	server_ip_ratelimit_size | server_ratelimit_size |
+	server_ratelimit_for_domain |
 	server_ratelimit_below_domain | server_ratelimit_factor |
+	server_ip_ratelimit_factor |
 	server_caps_whitelist | server_cache_max_negative_ttl |
 	server_permit_small_holddown | server_qname_minimisation |
 	server_ip_freebind | server_define_tag | server_local_zone_tag |
@@ -1504,6 +1509,16 @@ server_access_control_view: VAR_ACCESS_CONTROL_VIEW STRING_ARG STRING_ARG
 		}
 	}
 	;
+server_ip_ratelimit: VAR_IP_RATELIMIT STRING_ARG 
+	{ 
+		OUTYY(("P(server_ip_ratelimit:%s)\n", $2)); 
+		if(atoi($2) == 0 && strcmp($2, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->ip_ratelimit = atoi($2);
+		free($2);
+	}
+	;
+
 server_ratelimit: VAR_RATELIMIT STRING_ARG 
 	{ 
 		OUTYY(("P(server_ratelimit:%s)\n", $2)); 
@@ -1513,6 +1528,14 @@ server_ratelimit: VAR_RATELIMIT STRING_ARG
 		free($2);
 	}
 	;
+server_ip_ratelimit_size: VAR_IP_RATELIMIT_SIZE STRING_ARG
+  {
+  	OUTYY(("P(server_ip_ratelimit_size:%s)\n", $2));
+  	if(!cfg_parse_memsize($2, &cfg_parser->cfg->ip_ratelimit_size))
+  		yyerror("memory size expected");
+  	free($2);
+  }
+  ;
 server_ratelimit_size: VAR_RATELIMIT_SIZE STRING_ARG
 	{
 		OUTYY(("P(server_ratelimit_size:%s)\n", $2));
@@ -1521,6 +1544,19 @@ server_ratelimit_size: VAR_RATELIMIT_SIZE STRING_ARG
 		free($2);
 	}
 	;
+server_ip_ratelimit_slabs: VAR_IP_RATELIMIT_SLABS STRING_ARG
+  {
+  	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", $2));
+  	if(atoi($2) == 0)
+  		yyerror("number expected");
+  	else {
+  		cfg_parser->cfg->ip_ratelimit_slabs = atoi($2);
+  		if(!is_pow2(cfg_parser->cfg->ip_ratelimit_slabs))
+  			yyerror("must be a power of 2");
+  	}
+  	free($2);
+  }
+  ;
 server_ratelimit_slabs: VAR_RATELIMIT_SLABS STRING_ARG
 	{
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", $2));
@@ -1560,6 +1596,15 @@ server_ratelimit_below_domain: VAR_RATELIMIT_BELOW_DOMAIN STRING_ARG STRING_ARG
 		}
 	}
 	;
+server_ip_ratelimit_factor: VAR_IP_RATELIMIT_FACTOR STRING_ARG 
+  { 
+  	OUTYY(("P(server_ip_ratelimit_factor:%s)\n", $2)); 
+  	if(atoi($2) == 0 && strcmp($2, "0") != 0)
+  		yyerror("number expected");
+  	else cfg_parser->cfg->ip_ratelimit_factor = atoi($2);
+  	free($2);
+	}
+	;
 server_ratelimit_factor: VAR_RATELIMIT_FACTOR STRING_ARG 
 	{ 
 		OUTYY(("P(server_ratelimit_factor:%s)\n", $2)); 
diff --git a/util/data/msgreply.h b/util/data/msgreply.h
index 407f01114..3e6aec4bc 100644
--- a/util/data/msgreply.h
+++ b/util/data/msgreply.h
@@ -456,7 +456,7 @@ void log_dns_msg(const char* str, struct query_info* qinfo,
  * status code from, and size of a query response.
  *
  * @param v: at what verbosity level to print this.
- * @param qinfo: query section.
+ * @param qinf: query section.
  * @param addr: address of the client.
  * @param addrlen: length of the client address.
  * @param dur: how long it took to complete the query.
diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c
index cbcf8f5f5..f79e78000 100644
--- a/util/fptr_wlist.c
+++ b/util/fptr_wlist.c
@@ -216,6 +216,7 @@ fptr_whitelist_hash_sizefunc(lruhash_sizefunc_t fptr)
 	else if(fptr == &infra_sizefunc) return 1;
 	else if(fptr == &key_entry_sizefunc) return 1;
 	else if(fptr == &rate_sizefunc) return 1;
+	else if(fptr == &ip_rate_sizefunc) return 1;
 	else if(fptr == &test_slabhash_sizefunc) return 1;
 	return 0;
 }
@@ -228,6 +229,7 @@ fptr_whitelist_hash_compfunc(lruhash_compfunc_t fptr)
 	else if(fptr == &infra_compfunc) return 1;
 	else if(fptr == &key_entry_compfunc) return 1;
 	else if(fptr == &rate_compfunc) return 1;
+	else if(fptr == &ip_rate_compfunc) return 1;
 	else if(fptr == &test_slabhash_compfunc) return 1;
 	return 0;
 }
@@ -240,6 +242,7 @@ fptr_whitelist_hash_delkeyfunc(lruhash_delkeyfunc_t fptr)
 	else if(fptr == &infra_delkeyfunc) return 1;
 	else if(fptr == &key_entry_delkeyfunc) return 1;
 	else if(fptr == &rate_delkeyfunc) return 1;
+	else if(fptr == &ip_rate_delkeyfunc) return 1;
 	else if(fptr == &test_slabhash_delkey) return 1;
 	return 0;
 }