diff --git a/Zend/tests/bug74603.ini b/Zend/tests/bug74603.ini
new file mode 100644
index 0000000000000..8d74a570ec88a
--- /dev/null
+++ b/Zend/tests/bug74603.ini
@@ -0,0 +1 @@
+0=0&~2000000000
diff --git a/Zend/tests/bug74603.phpt b/Zend/tests/bug74603.phpt
new file mode 100644
index 0000000000000..b3194ecd48f7d
--- /dev/null
+++ b/Zend/tests/bug74603.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #74603 (PHP INI Parsing Stack Buffer Overflow Vulnerability)
+--SKIPIF--
+<?php
+if (PHP_INT_MAX !== 2147483647)
+        die('skip for 32-bit only');
+--FILE--
+<?php
+var_dump(parse_ini_file(__DIR__ . "/bug74603.ini", true, INI_SCANNER_NORMAL));
+?>
+--EXPECT--
+array(1) {
+  [0]=>
+  string(1) "0"
+}
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index 333d001ef71be..82997e7f02fdc 100644
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -55,7 +55,7 @@ static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2)
 	int i_result;
 	int i_op1, i_op2;
 	int str_len;
-	char str_result[MAX_LENGTH_OF_LONG];
+	char str_result[MAX_LENGTH_OF_LONG+1];
 
 	i_op1 = atoi(Z_STRVAL_P(op1));
 	zend_string_free(Z_STR_P(op1));
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index e3f2ff2d7fb71..f599b7f846069 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.15.3 on Fri Oct  7 13:19:24 2016 */
+/* Generated by re2c 0.15.3 on Tue Jul  4 21:22:52 2017 */
 #line 1 "ext/date/lib/parse_date.re"
 /*
  * The MIT License (MIT)
@@ -880,7 +880,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		  0,   0,   0,   0,   0,   0,   0,   0, 
 		  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
-	if ((YYLIMIT - YYCURSOR) < 31) YYFILL(31);
+	if ((YYLIMIT - YYCURSOR) < 33) YYFILL(33);
 	yych = *YYCURSOR;
 	switch (yych) {
 	case 0x00:
@@ -965,14 +965,14 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'D') goto yy165;
-			goto yy1581;
+			goto yy1521;
 		}
 	} else {
 		if (yych <= 'd') {
 			if (yych <= 'Z') goto yy165;
 			if (yych >= 'a') goto yy170;
 		} else {
-			if (yych <= 'e') goto yy1590;
+			if (yych <= 'e') goto yy1530;
 			if (yych <= 'z') goto yy170;
 		}
 	}
@@ -1000,7 +1000,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'D') goto yy165;
-			goto yy1581;
+			goto yy1521;
 		}
 	} else {
 		if (yych <= 'd') {
@@ -1008,7 +1008,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy165;
 		} else {
-			if (yych <= 'e') goto yy1581;
+			if (yych <= 'e') goto yy1521;
 			if (yych <= 'z') goto yy165;
 			goto yy3;
 		}
@@ -1022,12 +1022,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy165;
 		} else {
 			if (yych <= 'H') {
-				if (yych <= 'E') goto yy1552;
+				if (yych <= 'E') goto yy1492;
 				goto yy165;
 			} else {
-				if (yych <= 'I') goto yy1553;
+				if (yych <= 'I') goto yy1493;
 				if (yych <= 'N') goto yy165;
-				goto yy1551;
+				goto yy1491;
 			}
 		}
 	} else {
@@ -1036,15 +1036,15 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= 'Z') goto yy165;
 				goto yy3;
 			} else {
-				if (yych == 'e') goto yy1568;
+				if (yych == 'e') goto yy1508;
 				goto yy170;
 			}
 		} else {
 			if (yych <= 'n') {
-				if (yych <= 'i') goto yy1569;
+				if (yych <= 'i') goto yy1509;
 				goto yy170;
 			} else {
-				if (yych <= 'o') goto yy1567;
+				if (yych <= 'o') goto yy1507;
 				if (yych <= 'z') goto yy170;
 				goto yy3;
 			}
@@ -1059,12 +1059,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy165;
 		} else {
 			if (yych <= 'H') {
-				if (yych <= 'E') goto yy1552;
+				if (yych <= 'E') goto yy1492;
 				goto yy165;
 			} else {
-				if (yych <= 'I') goto yy1553;
+				if (yych <= 'I') goto yy1493;
 				if (yych <= 'N') goto yy165;
-				goto yy1551;
+				goto yy1491;
 			}
 		}
 	} else {
@@ -1073,15 +1073,15 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= 'Z') goto yy165;
 				goto yy3;
 			} else {
-				if (yych == 'e') goto yy1552;
+				if (yych == 'e') goto yy1492;
 				goto yy165;
 			}
 		} else {
 			if (yych <= 'n') {
-				if (yych <= 'i') goto yy1553;
+				if (yych <= 'i') goto yy1493;
 				goto yy165;
 			} else {
-				if (yych <= 'o') goto yy1551;
+				if (yych <= 'o') goto yy1491;
 				if (yych <= 'z') goto yy165;
 				goto yy3;
 			}
@@ -1093,24 +1093,24 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'A') {
 			if (yych == ')') goto yy164;
 			if (yych <= '@') goto yy3;
-			goto yy1521;
+			goto yy1461;
 		} else {
-			if (yych == 'I') goto yy1522;
+			if (yych == 'I') goto yy1462;
 			if (yych <= 'N') goto yy165;
-			goto yy1523;
+			goto yy1463;
 		}
 	} else {
 		if (yych <= 'h') {
 			if (yych <= 'Z') goto yy165;
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1536;
+			if (yych <= 'a') goto yy1476;
 			goto yy170;
 		} else {
 			if (yych <= 'n') {
-				if (yych <= 'i') goto yy1537;
+				if (yych <= 'i') goto yy1477;
 				goto yy170;
 			} else {
-				if (yych <= 'o') goto yy1538;
+				if (yych <= 'o') goto yy1478;
 				if (yych <= 'z') goto yy170;
 				goto yy3;
 			}
@@ -1122,24 +1122,24 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'A') {
 			if (yych == ')') goto yy164;
 			if (yych <= '@') goto yy3;
-			goto yy1521;
+			goto yy1461;
 		} else {
-			if (yych == 'I') goto yy1522;
+			if (yych == 'I') goto yy1462;
 			if (yych <= 'N') goto yy165;
-			goto yy1523;
+			goto yy1463;
 		}
 	} else {
 		if (yych <= 'h') {
 			if (yych <= 'Z') goto yy165;
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1521;
+			if (yych <= 'a') goto yy1461;
 			goto yy165;
 		} else {
 			if (yych <= 'n') {
-				if (yych <= 'i') goto yy1522;
+				if (yych <= 'i') goto yy1462;
 				goto yy165;
 			} else {
-				if (yych <= 'o') goto yy1523;
+				if (yych <= 'o') goto yy1463;
 				if (yych <= 'z') goto yy165;
 				goto yy3;
 			}
@@ -1151,15 +1151,15 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	switch (yych) {
 	case ')':	goto yy164;
 	case '0':
-	case '1':	goto yy1451;
-	case '2':	goto yy1452;
+	case '1':	goto yy1391;
+	case '2':	goto yy1392;
 	case '3':
 	case '4':
 	case '5':
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy1453;
+	case '9':	goto yy1393;
 	case 'A':
 	case 'B':
 	case 'C':
@@ -1181,11 +1181,11 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	case 'X':
 	case 'Y':
 	case 'Z':	goto yy165;
-	case 'E':	goto yy1446;
-	case 'H':	goto yy1447;
-	case 'O':	goto yy1448;
-	case 'U':	goto yy1449;
-	case 'W':	goto yy1450;
+	case 'E':	goto yy1386;
+	case 'H':	goto yy1387;
+	case 'O':	goto yy1388;
+	case 'U':	goto yy1389;
+	case 'W':	goto yy1390;
 	case 'a':
 	case 'b':
 	case 'c':
@@ -1207,11 +1207,11 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	case 'x':
 	case 'y':
 	case 'z':	goto yy170;
-	case 'e':	goto yy1489;
-	case 'h':	goto yy1490;
-	case 'o':	goto yy1491;
-	case 'u':	goto yy1492;
-	case 'w':	goto yy1493;
+	case 'e':	goto yy1429;
+	case 'h':	goto yy1430;
+	case 'o':	goto yy1431;
+	case 'u':	goto yy1432;
+	case 'w':	goto yy1433;
 	default:	goto yy3;
 	}
 yy10:
@@ -1220,15 +1220,15 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	switch (yych) {
 	case ')':	goto yy164;
 	case '0':
-	case '1':	goto yy1451;
-	case '2':	goto yy1452;
+	case '1':	goto yy1391;
+	case '2':	goto yy1392;
 	case '3':
 	case '4':
 	case '5':
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy1453;
+	case '9':	goto yy1393;
 	case 'A':
 	case 'B':
 	case 'C':
@@ -1272,23 +1272,23 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	case 'y':
 	case 'z':	goto yy165;
 	case 'E':
-	case 'e':	goto yy1446;
+	case 'e':	goto yy1386;
 	case 'H':
-	case 'h':	goto yy1447;
+	case 'h':	goto yy1387;
 	case 'O':
-	case 'o':	goto yy1448;
+	case 'o':	goto yy1388;
 	case 'U':
-	case 'u':	goto yy1449;
+	case 'u':	goto yy1389;
 	case 'W':
-	case 'w':	goto yy1450;
+	case 'w':	goto yy1390;
 	default:	goto yy3;
 	}
 yy11:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy1434;
+	if (yych == '-') goto yy1374;
 	if (yych <= '/') goto yy12;
-	if (yych <= '9') goto yy1435;
+	if (yych <= '9') goto yy1375;
 yy12:
 #line 1768 "ext/date/lib/parse_date.re"
 	{
@@ -1306,16 +1306,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			} else {
 				if (yych <= '@') goto yy3;
 				if (yych <= 'D') goto yy165;
-				goto yy1370;
+				goto yy1310;
 			}
 		} else {
 			if (yych <= 'N') {
-				if (yych == 'I') goto yy1371;
+				if (yych == 'I') goto yy1311;
 				goto yy165;
 			} else {
-				if (yych <= 'O') goto yy1372;
+				if (yych <= 'O') goto yy1312;
 				if (yych <= 'Q') goto yy165;
-				goto yy1373;
+				goto yy1313;
 			}
 		}
 	} else {
@@ -1325,16 +1325,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy170;
 			} else {
-				if (yych <= 'e') goto yy1411;
+				if (yych <= 'e') goto yy1351;
 				if (yych <= 'h') goto yy170;
-				goto yy1412;
+				goto yy1352;
 			}
 		} else {
 			if (yych <= 'q') {
-				if (yych == 'o') goto yy1413;
+				if (yych == 'o') goto yy1353;
 				goto yy170;
 			} else {
-				if (yych <= 'r') goto yy1414;
+				if (yych <= 'r') goto yy1354;
 				if (yych <= 'z') goto yy170;
 				goto yy3;
 			}
@@ -1350,16 +1350,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			} else {
 				if (yych <= '@') goto yy3;
 				if (yych <= 'D') goto yy165;
-				goto yy1370;
+				goto yy1310;
 			}
 		} else {
 			if (yych <= 'N') {
-				if (yych == 'I') goto yy1371;
+				if (yych == 'I') goto yy1311;
 				goto yy165;
 			} else {
-				if (yych <= 'O') goto yy1372;
+				if (yych <= 'O') goto yy1312;
 				if (yych <= 'Q') goto yy165;
-				goto yy1373;
+				goto yy1313;
 			}
 		}
 	} else {
@@ -1369,16 +1369,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy165;
 			} else {
-				if (yych <= 'e') goto yy1370;
+				if (yych <= 'e') goto yy1310;
 				if (yych <= 'h') goto yy165;
-				goto yy1371;
+				goto yy1311;
 			}
 		} else {
 			if (yych <= 'q') {
-				if (yych == 'o') goto yy1372;
+				if (yych == 'o') goto yy1312;
 				goto yy165;
 			} else {
-				if (yych <= 'r') goto yy1373;
+				if (yych <= 'r') goto yy1313;
 				if (yych <= 'z') goto yy165;
 				goto yy3;
 			}
@@ -1389,13 +1389,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	if (yych <= 'A') {
 		if (yych == ')') goto yy164;
 		if (yych <= '@') goto yy3;
-		goto yy1356;
+		goto yy1296;
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') goto yy165;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1367;
+			if (yych <= 'a') goto yy1307;
 			if (yych <= 'z') goto yy170;
 			goto yy3;
 		}
@@ -1405,13 +1405,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	if (yych <= 'A') {
 		if (yych == ')') goto yy164;
 		if (yych <= '@') goto yy3;
-		goto yy1356;
+		goto yy1296;
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') goto yy165;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1356;
+			if (yych <= 'a') goto yy1296;
 			if (yych <= 'z') goto yy165;
 			goto yy3;
 		}
@@ -1421,13 +1421,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	if (yych <= 'A') {
 		if (yych == ')') goto yy164;
 		if (yych <= '@') goto yy3;
-		goto yy1336;
+		goto yy1276;
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') goto yy165;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1353;
+			if (yych <= 'a') goto yy1293;
 			if (yych <= 'z') goto yy170;
 			goto yy3;
 		}
@@ -1437,13 +1437,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	if (yych <= 'A') {
 		if (yych == ')') goto yy164;
 		if (yych <= '@') goto yy3;
-		goto yy1336;
+		goto yy1276;
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') goto yy165;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1336;
+			if (yych <= 'a') goto yy1276;
 			if (yych <= 'z') goto yy165;
 			goto yy3;
 		}
@@ -1457,17 +1457,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				goto yy164;
 			} else {
 				if (yych <= '@') goto yy3;
-				if (yych <= 'A') goto yy1279;
+				if (yych <= 'A') goto yy1219;
 				goto yy165;
 			}
 		} else {
 			if (yych <= 'H') {
-				if (yych <= 'E') goto yy1278;
+				if (yych <= 'E') goto yy1218;
 				goto yy165;
 			} else {
-				if (yych <= 'I') goto yy1280;
+				if (yych <= 'I') goto yy1220;
 				if (yych <= 'T') goto yy165;
-				goto yy1281;
+				goto yy1221;
 			}
 		}
 	} else {
@@ -1476,16 +1476,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= 'Z') goto yy165;
 				goto yy3;
 			} else {
-				if (yych <= 'a') goto yy1308;
+				if (yych <= 'a') goto yy1248;
 				if (yych <= 'd') goto yy170;
-				goto yy1307;
+				goto yy1247;
 			}
 		} else {
 			if (yych <= 't') {
-				if (yych == 'i') goto yy1309;
+				if (yych == 'i') goto yy1249;
 				goto yy170;
 			} else {
-				if (yych <= 'u') goto yy1310;
+				if (yych <= 'u') goto yy1250;
 				if (yych <= 'z') goto yy170;
 				goto yy3;
 			}
@@ -1500,17 +1500,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				goto yy164;
 			} else {
 				if (yych <= '@') goto yy3;
-				if (yych <= 'A') goto yy1279;
+				if (yych <= 'A') goto yy1219;
 				goto yy165;
 			}
 		} else {
 			if (yych <= 'H') {
-				if (yych <= 'E') goto yy1278;
+				if (yych <= 'E') goto yy1218;
 				goto yy165;
 			} else {
-				if (yych <= 'I') goto yy1280;
+				if (yych <= 'I') goto yy1220;
 				if (yych <= 'T') goto yy165;
-				goto yy1281;
+				goto yy1221;
 			}
 		}
 	} else {
@@ -1519,16 +1519,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= 'Z') goto yy165;
 				goto yy3;
 			} else {
-				if (yych <= 'a') goto yy1279;
+				if (yych <= 'a') goto yy1219;
 				if (yych <= 'd') goto yy165;
-				goto yy1278;
+				goto yy1218;
 			}
 		} else {
 			if (yych <= 't') {
-				if (yych == 'i') goto yy1280;
+				if (yych == 'i') goto yy1220;
 				goto yy165;
 			} else {
-				if (yych <= 'u') goto yy1281;
+				if (yych <= 'u') goto yy1221;
 				if (yych <= 'z') goto yy165;
 				goto yy3;
 			}
@@ -1541,18 +1541,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych == ')') goto yy164;
 			goto yy3;
 		} else {
-			if (yych == 'I') goto yy1248;
+			if (yych == 'I') goto yy1188;
 			if (yych <= 'K') goto yy165;
-			goto yy1249;
+			goto yy1189;
 		}
 	} else {
 		if (yych <= 'i') {
 			if (yych <= 'Z') goto yy165;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'h') goto yy170;
-			goto yy1266;
+			goto yy1206;
 		} else {
-			if (yych == 'l') goto yy1267;
+			if (yych == 'l') goto yy1207;
 			if (yych <= 'z') goto yy170;
 			goto yy3;
 		}
@@ -1564,18 +1564,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych == ')') goto yy164;
 			goto yy3;
 		} else {
-			if (yych == 'I') goto yy1248;
+			if (yych == 'I') goto yy1188;
 			if (yych <= 'K') goto yy165;
-			goto yy1249;
+			goto yy1189;
 		}
 	} else {
 		if (yych <= 'i') {
 			if (yych <= 'Z') goto yy165;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'h') goto yy165;
-			goto yy1248;
+			goto yy1188;
 		} else {
-			if (yych == 'l') goto yy1249;
+			if (yych == 'l') goto yy1189;
 			if (yych <= 'z') goto yy165;
 			goto yy3;
 		}
@@ -1589,7 +1589,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'Q') goto yy165;
-			goto yy1122;
+			goto yy1062;
 		}
 	} else {
 		if (yych <= 'q') {
@@ -1597,7 +1597,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy170;
 		} else {
-			if (yych <= 'r') goto yy1241;
+			if (yych <= 'r') goto yy1181;
 			if (yych <= 'z') goto yy170;
 			goto yy3;
 		}
@@ -1611,7 +1611,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'Q') goto yy165;
-			goto yy1122;
+			goto yy1062;
 		}
 	} else {
 		if (yych <= 'q') {
@@ -1619,7 +1619,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy165;
 		} else {
-			if (yych <= 'r') goto yy1122;
+			if (yych <= 'r') goto yy1062;
 			if (yych <= 'z') goto yy165;
 			goto yy3;
 		}
@@ -1631,42 +1631,42 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= '@') {
 			if (yych <= '-') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy1076;
+					if (yych == '\t') goto yy1016;
 					goto yy12;
 				} else {
-					if (yych <= ' ') goto yy1078;
+					if (yych <= ' ') goto yy1018;
 					if (yych <= ',') goto yy12;
-					goto yy497;
+					goto yy437;
 				}
 			} else {
 				if (yych <= '0') {
-					if (yych <= '.') goto yy1088;
-					if (yych <= '/') goto yy496;
-					goto yy1121;
+					if (yych <= '.') goto yy1028;
+					if (yych <= '/') goto yy436;
+					goto yy1061;
 				} else {
-					if (yych <= '9') goto yy1120;
-					if (yych <= ':') goto yy1089;
+					if (yych <= '9') goto yy1060;
+					if (yych <= ':') goto yy1029;
 					goto yy12;
 				}
 			}
 		} else {
 			if (yych <= 'G') {
 				if (yych <= 'D') {
-					if (yych <= 'A') goto yy1078;
+					if (yych <= 'A') goto yy1018;
 					if (yych <= 'C') goto yy12;
-					goto yy1078;
+					goto yy1018;
 				} else {
-					if (yych == 'F') goto yy1078;
+					if (yych == 'F') goto yy1018;
 					goto yy12;
 				}
 			} else {
 				if (yych <= 'O') {
-					if (yych <= 'J') goto yy1078;
+					if (yych <= 'J') goto yy1018;
 					if (yych <= 'L') goto yy12;
-					goto yy1078;
+					goto yy1018;
 				} else {
 					if (yych <= 'R') goto yy12;
-					if (yych <= 'Y') goto yy1078;
+					if (yych <= 'Y') goto yy1018;
 					goto yy12;
 				}
 			}
@@ -1675,41 +1675,41 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'n') {
 			if (yych <= 'g') {
 				if (yych <= 'd') {
-					if (yych <= 'a') goto yy1078;
+					if (yych <= 'a') goto yy1018;
 					if (yych <= 'c') goto yy12;
-					goto yy1078;
+					goto yy1018;
 				} else {
-					if (yych == 'f') goto yy1078;
+					if (yych == 'f') goto yy1018;
 					goto yy12;
 				}
 			} else {
 				if (yych <= 'j') {
 					if (yych == 'i') goto yy12;
-					goto yy1078;
+					goto yy1018;
 				} else {
 					if (yych <= 'l') goto yy12;
-					if (yych <= 'm') goto yy1078;
-					goto yy494;
+					if (yych <= 'm') goto yy1018;
+					goto yy434;
 				}
 			}
 		} else {
 			if (yych <= 'u') {
 				if (yych <= 'r') {
-					if (yych <= 'o') goto yy1078;
+					if (yych <= 'o') goto yy1018;
 					if (yych <= 'q') goto yy12;
-					goto yy495;
+					goto yy435;
 				} else {
-					if (yych <= 's') goto yy489;
-					if (yych <= 't') goto yy492;
-					goto yy1078;
+					if (yych <= 's') goto yy429;
+					if (yych <= 't') goto yy432;
+					goto yy1018;
 				}
 			} else {
 				if (yych <= 'x') {
-					if (yych == 'w') goto yy1078;
+					if (yych == 'w') goto yy1018;
 					goto yy12;
 				} else {
-					if (yych <= 'y') goto yy1078;
-					if (yych == 0xC2) goto yy1078;
+					if (yych <= 'y') goto yy1018;
+					if (yych == 0xC2) goto yy1018;
 					goto yy12;
 				}
 			}
@@ -1722,42 +1722,42 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= '@') {
 			if (yych <= '-') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy484;
+					if (yych == '\t') goto yy424;
 					goto yy12;
 				} else {
-					if (yych <= ' ') goto yy486;
+					if (yych <= ' ') goto yy426;
 					if (yych <= ',') goto yy12;
-					goto yy497;
+					goto yy437;
 				}
 			} else {
 				if (yych <= '2') {
-					if (yych <= '.') goto yy498;
-					if (yych <= '/') goto yy496;
-					goto yy1120;
+					if (yych <= '.') goto yy438;
+					if (yych <= '/') goto yy436;
+					goto yy1060;
 				} else {
-					if (yych <= '9') goto yy1087;
-					if (yych <= ':') goto yy507;
+					if (yych <= '9') goto yy1027;
+					if (yych <= ':') goto yy447;
 					goto yy12;
 				}
 			}
 		} else {
 			if (yych <= 'G') {
 				if (yych <= 'D') {
-					if (yych <= 'A') goto yy486;
+					if (yych <= 'A') goto yy426;
 					if (yych <= 'C') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
-					if (yych == 'F') goto yy486;
+					if (yych == 'F') goto yy426;
 					goto yy12;
 				}
 			} else {
 				if (yych <= 'P') {
-					if (yych <= 'J') goto yy486;
+					if (yych <= 'J') goto yy426;
 					if (yych <= 'L') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
 					if (yych <= 'R') goto yy12;
-					if (yych <= 'Y') goto yy486;
+					if (yych <= 'Y') goto yy426;
 					goto yy12;
 				}
 			}
@@ -1766,41 +1766,41 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'n') {
 			if (yych <= 'g') {
 				if (yych <= 'd') {
-					if (yych <= 'a') goto yy486;
+					if (yych <= 'a') goto yy426;
 					if (yych <= 'c') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
-					if (yych == 'f') goto yy486;
+					if (yych == 'f') goto yy426;
 					goto yy12;
 				}
 			} else {
 				if (yych <= 'j') {
 					if (yych == 'i') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
 					if (yych <= 'l') goto yy12;
-					if (yych <= 'm') goto yy486;
-					goto yy494;
+					if (yych <= 'm') goto yy426;
+					goto yy434;
 				}
 			}
 		} else {
 			if (yych <= 'u') {
 				if (yych <= 'r') {
-					if (yych <= 'p') goto yy486;
+					if (yych <= 'p') goto yy426;
 					if (yych <= 'q') goto yy12;
-					goto yy495;
+					goto yy435;
 				} else {
-					if (yych <= 's') goto yy489;
-					if (yych <= 't') goto yy492;
-					goto yy486;
+					if (yych <= 's') goto yy429;
+					if (yych <= 't') goto yy432;
+					goto yy426;
 				}
 			} else {
 				if (yych <= 'x') {
-					if (yych == 'w') goto yy486;
+					if (yych == 'w') goto yy426;
 					goto yy12;
 				} else {
-					if (yych <= 'y') goto yy486;
-					if (yych == 0xC2) goto yy486;
+					if (yych <= 'y') goto yy426;
+					if (yych == 0xC2) goto yy426;
 					goto yy12;
 				}
 			}
@@ -1813,42 +1813,42 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= '@') {
 			if (yych <= '-') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy484;
+					if (yych == '\t') goto yy424;
 					goto yy12;
 				} else {
-					if (yych <= ' ') goto yy486;
+					if (yych <= ' ') goto yy426;
 					if (yych <= ',') goto yy12;
-					goto yy497;
+					goto yy437;
 				}
 			} else {
 				if (yych <= '4') {
-					if (yych <= '.') goto yy498;
-					if (yych <= '/') goto yy496;
-					goto yy1087;
+					if (yych <= '.') goto yy438;
+					if (yych <= '/') goto yy436;
+					goto yy1027;
 				} else {
-					if (yych <= '9') goto yy1074;
-					if (yych <= ':') goto yy507;
+					if (yych <= '9') goto yy1014;
+					if (yych <= ':') goto yy447;
 					goto yy12;
 				}
 			}
 		} else {
 			if (yych <= 'G') {
 				if (yych <= 'D') {
-					if (yych <= 'A') goto yy486;
+					if (yych <= 'A') goto yy426;
 					if (yych <= 'C') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
-					if (yych == 'F') goto yy486;
+					if (yych == 'F') goto yy426;
 					goto yy12;
 				}
 			} else {
 				if (yych <= 'P') {
-					if (yych <= 'J') goto yy486;
+					if (yych <= 'J') goto yy426;
 					if (yych <= 'L') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
 					if (yych <= 'R') goto yy12;
-					if (yych <= 'Y') goto yy486;
+					if (yych <= 'Y') goto yy426;
 					goto yy12;
 				}
 			}
@@ -1857,41 +1857,41 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'n') {
 			if (yych <= 'g') {
 				if (yych <= 'd') {
-					if (yych <= 'a') goto yy486;
+					if (yych <= 'a') goto yy426;
 					if (yych <= 'c') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
-					if (yych == 'f') goto yy486;
+					if (yych == 'f') goto yy426;
 					goto yy12;
 				}
 			} else {
 				if (yych <= 'j') {
 					if (yych == 'i') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
 					if (yych <= 'l') goto yy12;
-					if (yych <= 'm') goto yy486;
-					goto yy494;
+					if (yych <= 'm') goto yy426;
+					goto yy434;
 				}
 			}
 		} else {
 			if (yych <= 'u') {
 				if (yych <= 'r') {
-					if (yych <= 'p') goto yy486;
+					if (yych <= 'p') goto yy426;
 					if (yych <= 'q') goto yy12;
-					goto yy495;
+					goto yy435;
 				} else {
-					if (yych <= 's') goto yy489;
-					if (yych <= 't') goto yy492;
-					goto yy486;
+					if (yych <= 's') goto yy429;
+					if (yych <= 't') goto yy432;
+					goto yy426;
 				}
 			} else {
 				if (yych <= 'x') {
-					if (yych == 'w') goto yy486;
+					if (yych == 'w') goto yy426;
 					goto yy12;
 				} else {
-					if (yych <= 'y') goto yy486;
-					if (yych == 0xC2) goto yy486;
+					if (yych <= 'y') goto yy426;
+					if (yych == 0xC2) goto yy426;
 					goto yy12;
 				}
 			}
@@ -1904,42 +1904,42 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= '@') {
 			if (yych <= '-') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy484;
+					if (yych == '\t') goto yy424;
 					goto yy12;
 				} else {
-					if (yych <= ' ') goto yy486;
+					if (yych <= ' ') goto yy426;
 					if (yych <= ',') goto yy12;
-					goto yy497;
+					goto yy437;
 				}
 			} else {
 				if (yych <= '1') {
-					if (yych <= '.') goto yy498;
-					if (yych <= '/') goto yy496;
-					goto yy1074;
+					if (yych <= '.') goto yy438;
+					if (yych <= '/') goto yy436;
+					goto yy1014;
 				} else {
-					if (yych <= '9') goto yy493;
-					if (yych <= ':') goto yy507;
+					if (yych <= '9') goto yy433;
+					if (yych <= ':') goto yy447;
 					goto yy12;
 				}
 			}
 		} else {
 			if (yych <= 'G') {
 				if (yych <= 'D') {
-					if (yych <= 'A') goto yy486;
+					if (yych <= 'A') goto yy426;
 					if (yych <= 'C') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
-					if (yych == 'F') goto yy486;
+					if (yych == 'F') goto yy426;
 					goto yy12;
 				}
 			} else {
 				if (yych <= 'P') {
-					if (yych <= 'J') goto yy486;
+					if (yych <= 'J') goto yy426;
 					if (yych <= 'L') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
 					if (yych <= 'R') goto yy12;
-					if (yych <= 'Y') goto yy486;
+					if (yych <= 'Y') goto yy426;
 					goto yy12;
 				}
 			}
@@ -1948,41 +1948,41 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'n') {
 			if (yych <= 'g') {
 				if (yych <= 'd') {
-					if (yych <= 'a') goto yy486;
+					if (yych <= 'a') goto yy426;
 					if (yych <= 'c') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
-					if (yych == 'f') goto yy486;
+					if (yych == 'f') goto yy426;
 					goto yy12;
 				}
 			} else {
 				if (yych <= 'j') {
 					if (yych == 'i') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
 					if (yych <= 'l') goto yy12;
-					if (yych <= 'm') goto yy486;
-					goto yy494;
+					if (yych <= 'm') goto yy426;
+					goto yy434;
 				}
 			}
 		} else {
 			if (yych <= 'u') {
 				if (yych <= 'r') {
-					if (yych <= 'p') goto yy486;
+					if (yych <= 'p') goto yy426;
 					if (yych <= 'q') goto yy12;
-					goto yy495;
+					goto yy435;
 				} else {
-					if (yych <= 's') goto yy489;
-					if (yych <= 't') goto yy492;
-					goto yy486;
+					if (yych <= 's') goto yy429;
+					if (yych <= 't') goto yy432;
+					goto yy426;
 				}
 			} else {
 				if (yych <= 'x') {
-					if (yych == 'w') goto yy486;
+					if (yych == 'w') goto yy426;
 					goto yy12;
 				} else {
-					if (yych <= 'y') goto yy486;
-					if (yych == 0xC2) goto yy486;
+					if (yych <= 'y') goto yy426;
+					if (yych == 0xC2) goto yy426;
 					goto yy12;
 				}
 			}
@@ -1995,42 +1995,42 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'A') {
 			if (yych <= '-') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy484;
+					if (yych == '\t') goto yy424;
 					goto yy12;
 				} else {
-					if (yych <= ' ') goto yy486;
+					if (yych <= ' ') goto yy426;
 					if (yych <= ',') goto yy12;
-					goto yy497;
+					goto yy437;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '.') goto yy498;
-					if (yych <= '/') goto yy496;
-					goto yy493;
+					if (yych <= '.') goto yy438;
+					if (yych <= '/') goto yy436;
+					goto yy433;
 				} else {
-					if (yych <= ':') goto yy507;
+					if (yych <= ':') goto yy447;
 					if (yych <= '@') goto yy12;
-					goto yy486;
+					goto yy426;
 				}
 			}
 		} else {
 			if (yych <= 'J') {
 				if (yych <= 'E') {
-					if (yych == 'D') goto yy486;
+					if (yych == 'D') goto yy426;
 					goto yy12;
 				} else {
 					if (yych == 'G') goto yy12;
-					goto yy486;
+					goto yy426;
 				}
 			} else {
 				if (yych <= 'R') {
 					if (yych <= 'L') goto yy12;
-					if (yych <= 'P') goto yy486;
+					if (yych <= 'P') goto yy426;
 					goto yy12;
 				} else {
-					if (yych <= 'Y') goto yy486;
+					if (yych <= 'Y') goto yy426;
 					if (yych <= '`') goto yy12;
-					goto yy486;
+					goto yy426;
 				}
 			}
 		}
@@ -2038,38 +2038,38 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'p') {
 			if (yych <= 'h') {
 				if (yych <= 'e') {
-					if (yych == 'd') goto yy486;
+					if (yych == 'd') goto yy426;
 					goto yy12;
 				} else {
 					if (yych == 'g') goto yy12;
-					goto yy486;
+					goto yy426;
 				}
 			} else {
 				if (yych <= 'l') {
-					if (yych == 'j') goto yy486;
+					if (yych == 'j') goto yy426;
 					goto yy12;
 				} else {
-					if (yych == 'n') goto yy494;
-					goto yy486;
+					if (yych == 'n') goto yy434;
+					goto yy426;
 				}
 			}
 		} else {
 			if (yych <= 'v') {
 				if (yych <= 's') {
 					if (yych <= 'q') goto yy12;
-					if (yych <= 'r') goto yy495;
-					goto yy489;
+					if (yych <= 'r') goto yy435;
+					goto yy429;
 				} else {
-					if (yych <= 't') goto yy492;
-					if (yych <= 'u') goto yy486;
+					if (yych <= 't') goto yy432;
+					if (yych <= 'u') goto yy426;
 					goto yy12;
 				}
 			} else {
 				if (yych <= 'y') {
 					if (yych == 'x') goto yy12;
-					goto yy486;
+					goto yy426;
 				} else {
-					if (yych == 0xC2) goto yy486;
+					if (yych == 0xC2) goto yy426;
 					goto yy12;
 				}
 			}
@@ -2083,17 +2083,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	}
 	switch (yych) {
 	case '+':
-	case '-':	goto yy464;
+	case '-':	goto yy404;
 	case '0':
-	case '1':	goto yy461;
-	case '2':	goto yy462;
+	case '1':	goto yy401;
+	case '2':	goto yy402;
 	case '3':
 	case '4':
 	case '5':
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy463;
+	case '9':	goto yy403;
 	default:	goto yy12;
 	}
 yy31:
@@ -2123,13 +2123,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy3;
 				goto yy165;
 			} else {
-				if (yych <= 'I') goto yy460;
+				if (yych <= 'I') goto yy400;
 				if (yych <= 'U') goto yy165;
-				goto yy459;
+				goto yy399;
 			}
 		} else {
 			if (yych <= 'Z') {
-				if (yych == 'X') goto yy459;
+				if (yych == 'X') goto yy399;
 				goto yy165;
 			} else {
 				if (yych <= '`') goto yy3;
@@ -2159,7 +2159,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy165;
 		} else {
 			if (yych <= 'Z') {
-				if (yych <= 'I') goto yy456;
+				if (yych <= 'I') goto yy396;
 				goto yy165;
 			} else {
 				if (yych <= '`') goto yy3;
@@ -2189,7 +2189,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy165;
 		} else {
 			if (yych <= 'Z') {
-				if (yych <= 'I') goto yy454;
+				if (yych <= 'I') goto yy394;
 				goto yy165;
 			} else {
 				if (yych <= '`') goto yy3;
@@ -2205,17 +2205,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych == ')') goto yy164;
 			goto yy3;
 		} else {
-			if (yych <= 'A') goto yy437;
+			if (yych <= 'A') goto yy377;
 			if (yych <= 'T') goto yy165;
-			goto yy436;
+			goto yy376;
 		}
 	} else {
 		if (yych <= 'a') {
 			if (yych <= 'Z') goto yy165;
 			if (yych <= '`') goto yy3;
-			goto yy446;
+			goto yy386;
 		} else {
-			if (yych == 'u') goto yy445;
+			if (yych == 'u') goto yy385;
 			if (yych <= 'z') goto yy170;
 			goto yy3;
 		}
@@ -2227,17 +2227,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych == ')') goto yy164;
 			goto yy3;
 		} else {
-			if (yych <= 'A') goto yy437;
+			if (yych <= 'A') goto yy377;
 			if (yych <= 'T') goto yy165;
-			goto yy436;
+			goto yy376;
 		}
 	} else {
 		if (yych <= 'a') {
 			if (yych <= 'Z') goto yy165;
 			if (yych <= '`') goto yy3;
-			goto yy437;
+			goto yy377;
 		} else {
-			if (yych == 'u') goto yy436;
+			if (yych == 'u') goto yy376;
 			if (yych <= 'z') goto yy165;
 			goto yy3;
 		}
@@ -2251,12 +2251,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy165;
 		} else {
 			if (yych <= 'O') {
-				if (yych <= 'G') goto yy415;
+				if (yych <= 'G') goto yy355;
 				goto yy165;
 			} else {
-				if (yych <= 'P') goto yy414;
+				if (yych <= 'P') goto yy354;
 				if (yych <= 'T') goto yy165;
-				goto yy413;
+				goto yy353;
 			}
 		}
 	} else {
@@ -2265,15 +2265,15 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= 'Z') goto yy165;
 				goto yy3;
 			} else {
-				if (yych == 'g') goto yy427;
+				if (yych == 'g') goto yy367;
 				goto yy170;
 			}
 		} else {
 			if (yych <= 't') {
-				if (yych <= 'p') goto yy426;
+				if (yych <= 'p') goto yy366;
 				goto yy170;
 			} else {
-				if (yych <= 'u') goto yy425;
+				if (yych <= 'u') goto yy365;
 				if (yych <= 'z') goto yy170;
 				goto yy3;
 			}
@@ -2288,12 +2288,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy165;
 		} else {
 			if (yych <= 'O') {
-				if (yych <= 'G') goto yy415;
+				if (yych <= 'G') goto yy355;
 				goto yy165;
 			} else {
-				if (yych <= 'P') goto yy414;
+				if (yych <= 'P') goto yy354;
 				if (yych <= 'T') goto yy165;
-				goto yy413;
+				goto yy353;
 			}
 		}
 	} else {
@@ -2302,15 +2302,15 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= 'Z') goto yy165;
 				goto yy3;
 			} else {
-				if (yych == 'g') goto yy415;
+				if (yych == 'g') goto yy355;
 				goto yy165;
 			}
 		} else {
 			if (yych <= 't') {
-				if (yych <= 'p') goto yy414;
+				if (yych <= 'p') goto yy354;
 				goto yy165;
 			} else {
-				if (yych <= 'u') goto yy413;
+				if (yych <= 'u') goto yy353;
 				if (yych <= 'z') goto yy165;
 				goto yy3;
 			}
@@ -2325,7 +2325,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'B') goto yy165;
-			goto yy403;
+			goto yy343;
 		}
 	} else {
 		if (yych <= 'b') {
@@ -2333,7 +2333,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy170;
 		} else {
-			if (yych <= 'c') goto yy408;
+			if (yych <= 'c') goto yy348;
 			if (yych <= 'z') goto yy170;
 			goto yy3;
 		}
@@ -2347,7 +2347,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'B') goto yy165;
-			goto yy403;
+			goto yy343;
 		}
 	} else {
 		if (yych <= 'b') {
@@ -2355,7 +2355,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy165;
 		} else {
-			if (yych <= 'c') goto yy403;
+			if (yych <= 'c') goto yy343;
 			if (yych <= 'z') goto yy165;
 			goto yy3;
 		}
@@ -2377,7 +2377,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy170;
 		} else {
-			if (yych <= 'e') goto yy394;
+			if (yych <= 'e') goto yy334;
 			if (yych <= 'z') goto yy170;
 			goto yy3;
 		}
@@ -2593,7 +2593,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	}
 yy56:
 	YYCURSOR = YYMARKER;
-	if (yyaccept <= 17) {
+	if (yyaccept <= 16) {
 		if (yyaccept <= 8) {
 			if (yyaccept <= 4) {
 				if (yyaccept <= 2) {
@@ -2618,113 +2618,109 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 					if (yyaccept == 5) {
 						goto yy218;
 					} else {
-						goto yy223;
+						goto yy232;
 					}
 				} else {
 					if (yyaccept == 7) {
-						goto yy247;
+						goto yy246;
 					} else {
-						goto yy319;
+						goto yy357;
 					}
 				}
 			}
 		} else {
-			if (yyaccept <= 13) {
-				if (yyaccept <= 11) {
-					if (yyaccept <= 10) {
-						if (yyaccept == 9) {
-							goto yy417;
-						} else {
-							goto yy500;
-						}
+			if (yyaccept <= 12) {
+				if (yyaccept <= 10) {
+					if (yyaccept == 9) {
+						goto yy440;
 					} else {
-						goto yy515;
+						goto yy455;
 					}
 				} else {
-					if (yyaccept == 12) {
-						goto yy636;
+					if (yyaccept == 11) {
+						goto yy576;
 					} else {
-						goto yy681;
+						goto yy621;
 					}
 				}
 			} else {
-				if (yyaccept <= 15) {
-					if (yyaccept == 14) {
-						goto yy691;
+				if (yyaccept <= 14) {
+					if (yyaccept == 13) {
+						goto yy631;
 					} else {
-						goto yy788;
+						goto yy728;
 					}
 				} else {
-					if (yyaccept == 16) {
-						goto yy808;
+					if (yyaccept == 15) {
+						goto yy748;
 					} else {
-						goto yy839;
+						goto yy779;
 					}
 				}
 			}
 		}
 	} else {
-		if (yyaccept <= 26) {
-			if (yyaccept <= 22) {
-				if (yyaccept <= 20) {
-					if (yyaccept <= 19) {
-						if (yyaccept == 18) {
-							goto yy846;
+		if (yyaccept <= 25) {
+			if (yyaccept <= 21) {
+				if (yyaccept <= 19) {
+					if (yyaccept <= 18) {
+						if (yyaccept == 17) {
+							goto yy786;
 						} else {
-							goto yy873;
+							goto yy813;
 						}
 					} else {
-						goto yy818;
+						goto yy758;
 					}
 				} else {
-					if (yyaccept == 21) {
-						goto yy479;
+					if (yyaccept == 20) {
+						goto yy419;
 					} else {
-						goto yy998;
+						goto yy938;
 					}
 				}
 			} else {
-				if (yyaccept <= 24) {
-					if (yyaccept == 23) {
-						goto yy867;
+				if (yyaccept <= 23) {
+					if (yyaccept == 22) {
+						goto yy807;
 					} else {
-						goto yy1092;
+						goto yy1032;
 					}
 				} else {
-					if (yyaccept == 25) {
-						goto yy1100;
+					if (yyaccept == 24) {
+						goto yy1040;
 					} else {
-						goto yy1144;
+						goto yy1084;
 					}
 				}
 			}
 		} else {
-			if (yyaccept <= 30) {
-				if (yyaccept <= 28) {
-					if (yyaccept == 27) {
-						goto yy1168;
+			if (yyaccept <= 29) {
+				if (yyaccept <= 27) {
+					if (yyaccept == 26) {
+						goto yy1108;
 					} else {
-						goto yy1344;
+						goto yy1284;
 					}
 				} else {
-					if (yyaccept == 29) {
-						goto yy1437;
+					if (yyaccept == 28) {
+						goto yy1377;
 					} else {
-						goto yy1475;
+						goto yy1415;
 					}
 				}
 			} else {
-				if (yyaccept <= 32) {
-					if (yyaccept == 31) {
-						goto yy1478;
+				if (yyaccept <= 31) {
+					if (yyaccept == 30) {
+						goto yy1418;
 					} else {
-						goto yy1558;
+						goto yy1498;
 					}
 				} else {
-					if (yyaccept == 33) {
-						goto yy1566;
+					if (yyaccept == 32) {
+						goto yy1506;
 					} else {
-						goto yy1589;
+						goto yy1529;
 					}
 				}
 			}
@@ -2950,7 +2946,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 2954 "ext/date/lib/parse_date.c"
+#line 2950 "ext/date/lib/parse_date.c"
 yy75:
 	yych = *++YYCURSOR;
 	if (yych == 'D') goto yy76;
@@ -3753,7 +3749,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEKDAY;
 	}
-#line 3757 "ext/date/lib/parse_date.c"
+#line 3753 "ext/date/lib/parse_date.c"
 yy192:
 	yych = *++YYCURSOR;
 	if (yych <= 'K') {
@@ -4233,14 +4229,14 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '@') {
 				if (yych <= '9') goto yy220;
 			} else {
-				if (yych == 'E') goto yy226;
+				if (yych == 'E') goto yy225;
 				goto yy167;
 			}
 		} else {
 			if (yych <= 'd') {
 				if (yych >= 'a') goto yy167;
 			} else {
-				if (yych <= 'e') goto yy226;
+				if (yych <= 'e') goto yy225;
 				if (yych <= 'z') goto yy167;
 			}
 		}
@@ -4255,10 +4251,10 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 4259 "ext/date/lib/parse_date.c"
+#line 4255 "ext/date/lib/parse_date.c"
 yy219:
 	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 21) YYFILL(21);
+	if ((YYLIMIT - YYCURSOR) < 23) YYFILL(23);
 	yych = *YYCURSOR;
 yy220:
 	if (yybm[0+yych] & 32) {
@@ -4266,104 +4262,147 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	}
 	if (yych <= '/') goto yy56;
 	if (yych <= '2') goto yy222;
-	if (yych <= '3') goto yy224;
-	if (yych <= '9') goto yy225;
+	if (yych <= '3') goto yy223;
+	if (yych <= '9') goto yy224;
 	goto yy56;
 yy221:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy220;
-	if (yych <= '0') goto yy381;
-	if (yych <= '2') goto yy382;
-	if (yych <= '3') goto yy383;
+	if (yych <= '0') goto yy324;
+	if (yych <= '2') goto yy325;
+	if (yych <= '3') goto yy326;
 	goto yy220;
 yy222:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'm') {
-		if (yych <= '1') {
-			if (yych <= '/') goto yy240;
-			if (yych <= '0') goto yy322;
-			goto yy323;
+	yych = *++YYCURSOR;
+	if (yych <= '9') {
+		if (yych <= ' ') {
+			if (yych <= 0x08) {
+				if (yych <= 0x00) goto yy238;
+				goto yy56;
+			} else {
+				if (yych <= '\t') goto yy236;
+				if (yych <= 0x1F) goto yy56;
+				goto yy236;
+			}
 		} else {
-			if (yych <= '2') goto yy379;
-			if (yych <= '9') goto yy380;
-			goto yy240;
+			if (yych <= '-') {
+				if (yych == ',') goto yy236;
+				goto yy56;
+			} else {
+				if (yych <= '.') goto yy236;
+				if (yych <= '/') goto yy56;
+				goto yy323;
+			}
 		}
 	} else {
-		if (yych <= 'r') {
-			if (yych <= 'n') goto yy236;
-			if (yych <= 'q') goto yy240;
-			goto yy237;
+		if (yych <= 'm') {
+			if (yych <= 'd') {
+				if (yych <= 'c') goto yy56;
+				goto yy236;
+			} else {
+				if (yych == 'h') goto yy236;
+				goto yy56;
+			}
 		} else {
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
+			if (yych <= 'r') {
+				if (yych <= 'n') goto yy233;
+				if (yych <= 'q') goto yy56;
+				goto yy234;
+			} else {
+				if (yych <= 's') goto yy231;
+				if (yych <= 't') goto yy235;
+				goto yy56;
+			}
 		}
 	}
 yy223:
-#line 1409 "ext/date/lib/parse_date.re"
-	{
-		int length = 0;
-		DEBUG_OUTPUT("datetextual | datenoyear");
-		TIMELIB_INIT;
-		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		TIMELIB_PROCESS_YEAR(s->time->y, length);
-		TIMELIB_DEINIT;
-		return TIMELIB_DATE_TEXT;
-	}
-#line 4318 "ext/date/lib/parse_date.c"
-yy224:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'm') {
-		if (yych <= '1') {
-			if (yych <= '/') goto yy240;
-			if (yych <= '0') goto yy322;
-			goto yy323;
+	yych = *++YYCURSOR;
+	if (yych <= '1') {
+		if (yych <= ' ') {
+			if (yych <= 0x08) {
+				if (yych <= 0x00) goto yy238;
+				goto yy56;
+			} else {
+				if (yych <= '\t') goto yy236;
+				if (yych <= 0x1F) goto yy56;
+				goto yy236;
+			}
 		} else {
-			if (yych <= '2') goto yy233;
-			if (yych <= '9') goto yy234;
-			goto yy240;
+			if (yych <= '-') {
+				if (yych == ',') goto yy236;
+				goto yy56;
+			} else {
+				if (yych <= '.') goto yy236;
+				if (yych <= '/') goto yy56;
+				goto yy323;
+			}
 		}
 	} else {
-		if (yych <= 'r') {
-			if (yych <= 'n') goto yy236;
-			if (yych <= 'q') goto yy240;
-			goto yy237;
+		if (yych <= 'm') {
+			if (yych <= 'd') {
+				if (yych <= '9') goto yy230;
+				if (yych <= 'c') goto yy56;
+				goto yy236;
+			} else {
+				if (yych == 'h') goto yy236;
+				goto yy56;
+			}
 		} else {
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
+			if (yych <= 'r') {
+				if (yych <= 'n') goto yy233;
+				if (yych <= 'q') goto yy56;
+				goto yy234;
+			} else {
+				if (yych <= 's') goto yy231;
+				if (yych <= 't') goto yy235;
+				goto yy56;
+			}
 		}
 	}
-yy225:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'm') {
-		if (yych <= '1') {
-			if (yych <= '/') goto yy240;
-			if (yych <= '0') goto yy231;
-			goto yy232;
+yy224:
+	yych = *++YYCURSOR;
+	if (yych <= '9') {
+		if (yych <= ' ') {
+			if (yych <= 0x08) {
+				if (yych <= 0x00) goto yy238;
+				goto yy56;
+			} else {
+				if (yych <= '\t') goto yy236;
+				if (yych <= 0x1F) goto yy56;
+				goto yy236;
+			}
 		} else {
-			if (yych <= '2') goto yy233;
-			if (yych <= '9') goto yy234;
-			goto yy240;
+			if (yych <= '-') {
+				if (yych == ',') goto yy236;
+				goto yy56;
+			} else {
+				if (yych <= '.') goto yy236;
+				if (yych <= '/') goto yy56;
+				goto yy230;
+			}
 		}
 	} else {
-		if (yych <= 'r') {
-			if (yych <= 'n') goto yy236;
-			if (yych <= 'q') goto yy240;
-			goto yy237;
+		if (yych <= 'm') {
+			if (yych <= 'd') {
+				if (yych <= 'c') goto yy56;
+				goto yy236;
+			} else {
+				if (yych == 'h') goto yy236;
+				goto yy56;
+			}
 		} else {
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
+			if (yych <= 'r') {
+				if (yych <= 'n') goto yy233;
+				if (yych <= 'q') goto yy56;
+				goto yy234;
+			} else {
+				if (yych <= 's') goto yy231;
+				if (yych <= 't') goto yy235;
+				goto yy56;
+			}
 		}
 	}
-yy226:
+yy225:
 	yych = *++YYCURSOR;
 	if (yych <= 'M') {
 		if (yych <= ')') {
@@ -4379,12 +4418,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'm') goto yy227;
+			if (yych <= 'm') goto yy226;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy227:
+yy226:
 	yych = *++YYCURSOR;
 	if (yych <= 'B') {
 		if (yych <= ')') {
@@ -4400,26 +4439,26 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'b') goto yy228;
+			if (yych <= 'b') goto yy227;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy228:
+yy227:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'E') goto yy229;
+		if (yych <= 'E') goto yy228;
 		if (yych != 'e') goto yy3;
 	}
-yy229:
+yy228:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy230;
+	if (yych == 'R') goto yy229;
 	if (yych != 'r') goto yy56;
-yy230:
+yy229:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
@@ -4436,129 +4475,143 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy218;
 		}
 	}
-yy231:
+yy230:
 	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '.') goto yy245;
-		goto yy56;
-	} else {
-		if (yych <= '0') goto yy320;
-		if (yych <= '9') goto yy321;
-		if (yych <= ':') goto yy245;
-		goto yy56;
-	}
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy320;
+	goto yy56;
+yy231:
+	yyaccept = 6;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == 't') goto yy319;
+	goto yy237;
 yy232:
-	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '.') goto yy288;
-		goto yy56;
-	} else {
-		if (yych <= '2') goto yy321;
-		if (yych <= '9') goto yy320;
-		if (yych <= ':') goto yy288;
-		goto yy56;
+#line 1409 "ext/date/lib/parse_date.re"
+	{
+		int length = 0;
+		DEBUG_OUTPUT("datetextual | datenoyear");
+		TIMELIB_INIT;
+		TIMELIB_HAVE_DATE();
+		s->time->m = timelib_get_month((char **) &ptr);
+		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
+		TIMELIB_PROCESS_YEAR(s->time->y, length);
+		TIMELIB_DEINIT;
+		return TIMELIB_DATE_TEXT;
 	}
+#line 4503 "ext/date/lib/parse_date.c"
 yy233:
-	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '.') goto yy288;
-		goto yy56;
-	} else {
-		if (yych <= '4') goto yy320;
-		if (yych <= '9') goto yy317;
-		if (yych <= ':') goto yy288;
-		goto yy56;
-	}
-yy234:
-	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '.') goto yy288;
-		goto yy56;
-	} else {
-		if (yych <= '9') goto yy317;
-		if (yych <= ':') goto yy288;
-		goto yy56;
-	}
-yy235:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy240;
-yy236:
 	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy240;
-yy237:
+	if (yych == 'd') goto yy319;
+	goto yy237;
+yy234:
 	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy240;
-yy238:
+	if (yych == 'd') goto yy319;
+	goto yy237;
+yy235:
 	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy240;
-yy239:
+	if (yych == 'h') goto yy319;
+	goto yy237;
+yy236:
 	yyaccept = 6;
 	YYMARKER = ++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 18) YYFILL(18);
 	yych = *YYCURSOR;
-yy240:
+yy237:
 	if (yybm[0+yych] & 64) {
-		goto yy239;
+		goto yy236;
 	}
 	if (yych <= '2') {
-		if (yych <= '/') goto yy223;
-		if (yych <= '0') goto yy283;
-		if (yych <= '1') goto yy284;
-		goto yy285;
+		if (yych <= '/') goto yy232;
+		if (yych <= '0') goto yy310;
+		if (yych <= '1') goto yy311;
+		goto yy312;
+	} else {
+		if (yych <= '9') goto yy313;
+		if (yych == 'T') goto yy239;
+		goto yy232;
+	}
+yy238:
+	yyaccept = 6;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '9') {
+		if (yych <= '0') {
+			if (yych <= '/') goto yy232;
+			goto yy240;
+		} else {
+			if (yych <= '1') goto yy241;
+			if (yych <= '2') goto yy242;
+			goto yy243;
+		}
 	} else {
-		if (yych <= '9') goto yy286;
-		if (yych != 'T') goto yy223;
+		if (yych <= 'T') {
+			if (yych <= 'S') goto yy232;
+		} else {
+			if (yych != 't') goto yy232;
+		}
 	}
+yy239:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy242;
-	if (yych <= '2') goto yy243;
-	if (yych <= '9') goto yy244;
+	if (yych <= '1') goto yy308;
+	if (yych <= '2') goto yy309;
+	if (yych <= '9') goto yy298;
 	goto yy56;
-yy242:
+yy240:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
-		if (yych == '.') goto yy245;
+		if (yych == '.') goto yy299;
 		goto yy56;
 	} else {
-		if (yych <= '9') goto yy244;
-		if (yych <= ':') goto yy245;
+		if (yych <= '0') goto yy298;
+		if (yych <= '9') goto yy243;
+		if (yych <= ':') goto yy299;
 		goto yy56;
 	}
-yy243:
+yy241:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
-		if (yych == '.') goto yy245;
+		if (yych == '.') goto yy244;
 		goto yy56;
 	} else {
-		if (yych <= '4') goto yy244;
-		if (yych == ':') goto yy245;
+		if (yych <= '2') goto yy243;
+		if (yych <= '9') goto yy298;
+		if (yych <= ':') goto yy244;
 		goto yy56;
 	}
-yy244:
+yy242:
+	yych = *++YYCURSOR;
+	if (yych <= '/') {
+		if (yych == '.') goto yy244;
+		goto yy56;
+	} else {
+		if (yych <= '4') goto yy298;
+		if (yych == ':') goto yy244;
+		goto yy56;
+	}
+yy243:
 	yych = *++YYCURSOR;
-	if (yych == '.') goto yy245;
+	if (yych == '.') goto yy244;
 	if (yych != ':') goto yy56;
-yy245:
+yy244:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy246;
-	if (yych <= '9') goto yy248;
+	if (yych <= '5') goto yy245;
+	if (yych <= '9') goto yy247;
 	goto yy56;
-yy246:
+yy245:
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy249;
+		if (yych == '.') goto yy248;
 	} else {
-		if (yych <= '9') goto yy248;
-		if (yych <= ':') goto yy249;
+		if (yych <= '9') goto yy291;
+		if (yych <= ':') goto yy248;
 	}
-yy247:
+yy246:
 #line 1711 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
@@ -4588,833 +4641,858 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 4592 "ext/date/lib/parse_date.c"
-yy248:
+#line 4645 "ext/date/lib/parse_date.c"
+yy247:
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy249;
-	if (yych != ':') goto yy247;
-yy249:
+	if (yych == '.') goto yy248;
+	if (yych != ':') goto yy246;
+yy248:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy250;
-	if (yych <= '6') goto yy251;
-	if (yych <= '9') goto yy252;
+	if (yych <= '5') goto yy249;
+	if (yych <= '6') goto yy250;
+	if (yych <= '9') goto yy251;
 	goto yy56;
+yy249:
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy246;
+	if (yych <= '9') goto yy252;
+	goto yy246;
 yy250:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy247;
-	if (yych <= '9') goto yy253;
-	goto yy247;
+	if (yych == '0') goto yy252;
+	goto yy246;
 yy251:
 	yych = *++YYCURSOR;
-	if (yych == '0') goto yy253;
-	goto yy247;
+	goto yy246;
 yy252:
-	yych = *++YYCURSOR;
-	goto yy247;
-yy253:
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '*') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy255;
-			goto yy247;
+			if (yych == '\t') goto yy254;
+			goto yy246;
 		} else {
-			if (yych <= ' ') goto yy255;
-			if (yych == '(') goto yy255;
-			goto yy247;
+			if (yych <= ' ') goto yy254;
+			if (yych == '(') goto yy254;
+			goto yy246;
 		}
 	} else {
 		if (yych <= '@') {
-			if (yych == ',') goto yy247;
-			if (yych <= '-') goto yy255;
-			goto yy247;
+			if (yych == ',') goto yy246;
+			if (yych <= '-') goto yy254;
+			goto yy246;
 		} else {
-			if (yych <= 'Z') goto yy255;
-			if (yych <= '`') goto yy247;
-			if (yych <= 'z') goto yy255;
-			goto yy247;
+			if (yych <= 'Z') goto yy254;
+			if (yych <= '`') goto yy246;
+			if (yych <= 'z') goto yy254;
+			goto yy246;
 		}
 	}
-yy254:
+yy253:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
 	yych = *YYCURSOR;
-yy255:
-	if (yych <= '+') {
-		if (yych <= ' ') {
-			if (yych == '\t') goto yy254;
-			if (yych <= 0x1F) goto yy56;
-			goto yy254;
+yy254:
+	if (yych <= '@') {
+		if (yych <= '\'') {
+			if (yych <= '\t') {
+				if (yych <= 0x08) goto yy56;
+				goto yy253;
+			} else {
+				if (yych == ' ') goto yy253;
+				goto yy56;
+			}
 		} else {
-			if (yych == '(') goto yy258;
-			if (yych <= '*') goto yy56;
-			goto yy257;
+			if (yych <= '+') {
+				if (yych <= '(') goto yy257;
+				if (yych <= '*') goto yy56;
+				goto yy256;
+			} else {
+				if (yych == '-') goto yy256;
+				goto yy56;
+			}
 		}
 	} else {
-		if (yych <= 'F') {
-			if (yych == '-') goto yy257;
-			if (yych <= '@') goto yy56;
-			goto yy259;
-		} else {
-			if (yych <= 'Z') {
-				if (yych >= 'H') goto yy259;
+		if (yych <= 'Z') {
+			if (yych <= 'G') {
+				if (yych <= 'A') goto yy258;
+				if (yych <= 'F') goto yy259;
 			} else {
+				if (yych == 'P') goto yy258;
+				goto yy259;
+			}
+		} else {
+			if (yych <= 'o') {
 				if (yych <= '`') goto yy56;
-				if (yych <= 'z') goto yy260;
+				if (yych <= 'a') goto yy260;
+				goto yy261;
+			} else {
+				if (yych <= 'p') goto yy260;
+				if (yych <= 'z') goto yy261;
 				goto yy56;
 			}
 		}
 	}
-yy256:
+yy255:
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
-		if (yych == ')') goto yy252;
-		if (yych <= '@') goto yy247;
-		goto yy261;
+		if (yych == ')') goto yy251;
+		if (yych <= '@') goto yy246;
+		goto yy262;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= 'M') goto yy281;
-			goto yy261;
+			if (yych <= 'M') goto yy289;
+			goto yy262;
 		} else {
-			if (yych <= '`') goto yy247;
-			if (yych <= 'z') goto yy266;
-			goto yy247;
+			if (yych <= '`') goto yy246;
+			if (yych <= 'z') goto yy273;
+			goto yy246;
 		}
 	}
-yy257:
+yy256:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy276;
-	if (yych <= '2') goto yy277;
-	if (yych <= '9') goto yy278;
+	if (yych <= '1') goto yy284;
+	if (yych <= '2') goto yy285;
+	if (yych <= '9') goto yy286;
 	goto yy56;
-yy258:
+yy257:
 	yych = *++YYCURSOR;
 	if (yych <= '@') goto yy56;
-	if (yych <= 'Z') goto yy260;
+	if (yych <= 'Z') goto yy261;
 	if (yych <= '`') goto yy56;
-	if (yych <= 'z') goto yy260;
+	if (yych <= 'z') goto yy261;
 	goto yy56;
+yy258:
+	yyaccept = 7;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= 'L') {
+		if (yych <= '-') {
+			if (yych == ')') goto yy251;
+			goto yy246;
+		} else {
+			if (yych <= '.') goto yy267;
+			if (yych <= '@') goto yy246;
+			goto yy262;
+		}
+	} else {
+		if (yych <= '`') {
+			if (yych <= 'M') goto yy268;
+			if (yych <= 'Z') goto yy262;
+			goto yy246;
+		} else {
+			if (yych == 'm') goto yy283;
+			if (yych <= 'z') goto yy273;
+			goto yy246;
+		}
+	}
 yy259:
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
-		if (yych == ')') goto yy252;
-		goto yy247;
+		if (yych == ')') goto yy251;
+		goto yy246;
 	} else {
-		if (yych <= 'Z') goto yy261;
-		if (yych <= '`') goto yy247;
-		if (yych <= 'z') goto yy266;
-		goto yy247;
+		if (yych <= 'Z') goto yy262;
+		if (yych <= '`') goto yy246;
+		if (yych <= 'z') goto yy273;
+		goto yy246;
 	}
 yy260:
-	yych = *++YYCURSOR;
-	if (yych <= '@') {
-		if (yych == ')') goto yy252;
-		goto yy247;
+	yyaccept = 7;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= 'L') {
+		if (yych <= '-') {
+			if (yych == ')') goto yy251;
+			goto yy246;
+		} else {
+			if (yych <= '.') goto yy267;
+			if (yych <= '@') goto yy246;
+			goto yy262;
+		}
 	} else {
-		if (yych <= 'Z') goto yy261;
-		if (yych <= '`') goto yy247;
-		if (yych >= '{') goto yy247;
+		if (yych <= '`') {
+			if (yych <= 'M') goto yy268;
+			if (yych <= 'Z') goto yy262;
+			goto yy246;
+		} else {
+			if (yych == 'm') goto yy268;
+			if (yych <= 'z') goto yy262;
+			goto yy246;
+		}
 	}
 yy261:
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
-		if (yych == ')') goto yy252;
-		goto yy247;
+		if (yych == ')') goto yy251;
+		goto yy246;
 	} else {
 		if (yych <= 'Z') goto yy262;
-		if (yych <= '`') goto yy247;
-		if (yych >= '{') goto yy247;
+		if (yych <= '`') goto yy246;
+		if (yych >= '{') goto yy246;
 	}
 yy262:
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
-		if (yych == ')') goto yy252;
-		goto yy247;
+		if (yych == ')') goto yy251;
+		goto yy246;
 	} else {
 		if (yych <= 'Z') goto yy263;
-		if (yych <= '`') goto yy247;
-		if (yych >= '{') goto yy247;
+		if (yych <= '`') goto yy246;
+		if (yych >= '{') goto yy246;
 	}
 yy263:
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
-		if (yych == ')') goto yy252;
-		goto yy247;
+		if (yych == ')') goto yy251;
+		goto yy246;
 	} else {
 		if (yych <= 'Z') goto yy264;
-		if (yych <= '`') goto yy247;
-		if (yych >= '{') goto yy247;
+		if (yych <= '`') goto yy246;
+		if (yych >= '{') goto yy246;
 	}
 yy264:
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
-		if (yych == ')') goto yy252;
-		goto yy247;
+		if (yych == ')') goto yy251;
+		goto yy246;
 	} else {
 		if (yych <= 'Z') goto yy265;
-		if (yych <= '`') goto yy247;
-		if (yych >= '{') goto yy247;
+		if (yych <= '`') goto yy246;
+		if (yych >= '{') goto yy246;
 	}
 yy265:
 	yych = *++YYCURSOR;
-	if (yych == ')') goto yy252;
-	goto yy247;
+	if (yych <= '@') {
+		if (yych == ')') goto yy251;
+		goto yy246;
+	} else {
+		if (yych <= 'Z') goto yy266;
+		if (yych <= '`') goto yy246;
+		if (yych >= '{') goto yy246;
+	}
 yy266:
+	yych = *++YYCURSOR;
+	if (yych == ')') goto yy251;
+	goto yy246;
+yy267:
+	yych = *++YYCURSOR;
+	if (yych == 'M') goto yy272;
+	if (yych == 'm') goto yy272;
+	goto yy56;
+yy268:
+	yyaccept = 7;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= ')') {
+		if (yych <= '\t') {
+			if (yych <= 0x00) goto yy270;
+			if (yych <= 0x08) goto yy246;
+			goto yy270;
+		} else {
+			if (yych == ' ') goto yy270;
+			if (yych <= '(') goto yy246;
+			goto yy251;
+		}
+	} else {
+		if (yych <= '@') {
+			if (yych != '.') goto yy246;
+		} else {
+			if (yych <= 'Z') goto yy263;
+			if (yych <= '`') goto yy246;
+			if (yych <= 'z') goto yy263;
+			goto yy246;
+		}
+	}
+yy269:
+	yych = *++YYCURSOR;
+	if (yych <= '\t') {
+		if (yych <= 0x00) goto yy270;
+		if (yych <= 0x08) goto yy56;
+	} else {
+		if (yych != ' ') goto yy56;
+	}
+yy270:
+	++YYCURSOR;
+#line 1687 "ext/date/lib/parse_date.re"
+	{
+		DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12");
+		TIMELIB_INIT;
+		TIMELIB_HAVE_DATE();
+		s->time->m = timelib_get_month((char **) &ptr);
+		s->time->d = timelib_get_nr((char **) &ptr, 2);
+
+		TIMELIB_HAVE_TIME();
+		s->time->h = timelib_get_nr((char **) &ptr, 2);
+		s->time->i = timelib_get_nr((char **) &ptr, 2);
+		if (*ptr == ':' || *ptr == '.') {
+			s->time->s = timelib_get_nr((char **) &ptr, 2);
+
+			if (*ptr == '.') {
+				s->time->f = timelib_get_frac_nr((char **) &ptr, 8);
+			}
+		}
+
+		s->time->h += timelib_meridian((char **) &ptr, s->time->h);
+		TIMELIB_DEINIT;
+		return TIMELIB_SHORTDATE_WITH_TIME;
+	}
+#line 4941 "ext/date/lib/parse_date.c"
+yy272:
+	yych = *++YYCURSOR;
+	if (yych <= 0x1F) {
+		if (yych <= 0x00) goto yy270;
+		if (yych == '\t') goto yy270;
+		goto yy56;
+	} else {
+		if (yych <= ' ') goto yy270;
+		if (yych == '.') goto yy269;
+		goto yy56;
+	}
+yy273:
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
-			if (yych == ')') goto yy252;
-			goto yy247;
+			if (yych == ')') goto yy251;
+			goto yy246;
 		} else {
-			if (yych == '.') goto yy247;
-			goto yy268;
+			if (yych == '.') goto yy246;
+			goto yy275;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy247;
-			if (yych <= 'Z') goto yy262;
-			goto yy247;
+			if (yych <= '@') goto yy246;
+			if (yych <= 'Z') goto yy263;
+			goto yy246;
 		} else {
-			if (yych <= '_') goto yy268;
-			if (yych <= '`') goto yy247;
-			if (yych >= '{') goto yy247;
+			if (yych <= '_') goto yy275;
+			if (yych <= '`') goto yy246;
+			if (yych >= '{') goto yy246;
 		}
 	}
-yy267:
+yy274:
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
-			if (yych == ')') goto yy252;
-			goto yy247;
+			if (yych == ')') goto yy251;
+			goto yy246;
 		} else {
-			if (yych == '.') goto yy247;
+			if (yych == '.') goto yy246;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy247;
-			if (yych <= 'Z') goto yy263;
-			goto yy247;
+			if (yych <= '@') goto yy246;
+			if (yych <= 'Z') goto yy264;
+			goto yy246;
 		} else {
-			if (yych <= '_') goto yy268;
-			if (yych <= '`') goto yy247;
-			if (yych <= 'z') goto yy271;
-			goto yy247;
+			if (yych <= '_') goto yy275;
+			if (yych <= '`') goto yy246;
+			if (yych <= 'z') goto yy278;
+			goto yy246;
 		}
 	}
-yy268:
+yy275:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yych <= '@') goto yy56;
-	if (yych <= 'Z') goto yy269;
+	if (yych <= 'Z') goto yy276;
 	if (yych <= '`') goto yy56;
 	if (yych >= '{') goto yy56;
-yy269:
+yy276:
 	yyaccept = 7;
 	YYMARKER = ++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yych <= '@') {
 		if (yych <= '-') {
-			if (yych <= ',') goto yy247;
-			goto yy268;
+			if (yych <= ',') goto yy246;
+			goto yy275;
 		} else {
-			if (yych == '/') goto yy268;
-			goto yy247;
+			if (yych == '/') goto yy275;
+			goto yy246;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'Z') goto yy269;
-			if (yych <= '^') goto yy247;
-			goto yy268;
+			if (yych <= 'Z') goto yy276;
+			if (yych <= '^') goto yy246;
+			goto yy275;
 		} else {
-			if (yych <= '`') goto yy247;
-			if (yych <= 'z') goto yy269;
-			goto yy247;
+			if (yych <= '`') goto yy246;
+			if (yych <= 'z') goto yy276;
+			goto yy246;
 		}
 	}
-yy271:
+yy278:
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
-			if (yych == ')') goto yy252;
-			goto yy247;
+			if (yych == ')') goto yy251;
+			goto yy246;
 		} else {
-			if (yych == '.') goto yy247;
-			goto yy268;
+			if (yych == '.') goto yy246;
+			goto yy275;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy247;
-			if (yych <= 'Z') goto yy264;
-			goto yy247;
+			if (yych <= '@') goto yy246;
+			if (yych <= 'Z') goto yy265;
+			goto yy246;
 		} else {
-			if (yych <= '_') goto yy268;
-			if (yych <= '`') goto yy247;
-			if (yych >= '{') goto yy247;
+			if (yych <= '_') goto yy275;
+			if (yych <= '`') goto yy246;
+			if (yych >= '{') goto yy246;
 		}
 	}
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
-			if (yych == ')') goto yy252;
-			goto yy247;
+			if (yych == ')') goto yy251;
+			goto yy246;
 		} else {
-			if (yych == '.') goto yy247;
-			goto yy268;
+			if (yych == '.') goto yy246;
+			goto yy275;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy247;
-			if (yych <= 'Z') goto yy265;
-			goto yy247;
+			if (yych <= '@') goto yy246;
+			if (yych <= 'Z') goto yy266;
+			goto yy246;
 		} else {
-			if (yych <= '_') goto yy268;
-			if (yych <= '`') goto yy247;
-			if (yych >= '{') goto yy247;
+			if (yych <= '_') goto yy275;
+			if (yych <= '`') goto yy246;
+			if (yych >= '{') goto yy246;
 		}
 	}
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= ')') {
-			if (yych <= '(') goto yy247;
-			goto yy252;
+			if (yych <= '(') goto yy246;
+			goto yy251;
 		} else {
-			if (yych == '-') goto yy268;
-			goto yy247;
+			if (yych == '-') goto yy275;
+			goto yy246;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= '/') goto yy268;
-			if (yych <= '^') goto yy247;
-			goto yy268;
+			if (yych <= '/') goto yy275;
+			if (yych <= '^') goto yy246;
+			goto yy275;
 		} else {
-			if (yych <= '`') goto yy247;
-			if (yych >= '{') goto yy247;
+			if (yych <= '`') goto yy246;
+			if (yych >= '{') goto yy246;
 		}
 	}
-yy274:
+yy281:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yych <= '/') {
-		if (yych == '-') goto yy268;
+		if (yych == '-') goto yy275;
 		if (yych <= '.') goto yy56;
-		goto yy268;
+		goto yy275;
 	} else {
 		if (yych <= '_') {
 			if (yych <= '^') goto yy56;
-			goto yy268;
+			goto yy275;
 		} else {
 			if (yych <= '`') goto yy56;
-			if (yych <= 'z') goto yy274;
+			if (yych <= 'z') goto yy281;
 			goto yy56;
 		}
 	}
-yy276:
+yy283:
+	yyaccept = 7;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '-') {
+		if (yych <= 0x1F) {
+			if (yych <= 0x00) goto yy270;
+			if (yych == '\t') goto yy270;
+			goto yy246;
+		} else {
+			if (yych <= '(') {
+				if (yych <= ' ') goto yy270;
+				goto yy246;
+			} else {
+				if (yych <= ')') goto yy251;
+				if (yych <= ',') goto yy246;
+				goto yy275;
+			}
+		}
+	} else {
+		if (yych <= 'Z') {
+			if (yych <= '.') goto yy269;
+			if (yych <= '/') goto yy275;
+			if (yych <= '@') goto yy246;
+			goto yy263;
+		} else {
+			if (yych <= '_') {
+				if (yych <= '^') goto yy246;
+				goto yy275;
+			} else {
+				if (yych <= '`') goto yy246;
+				if (yych <= 'z') goto yy274;
+				goto yy246;
+			}
+		}
+	}
+yy284:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy247;
-	if (yych <= '9') goto yy278;
-	if (yych <= ':') goto yy279;
-	goto yy247;
-yy277:
+	if (yych <= '/') goto yy246;
+	if (yych <= '9') goto yy286;
+	if (yych <= ':') goto yy287;
+	goto yy246;
+yy285:
 	yych = *++YYCURSOR;
 	if (yych <= '5') {
-		if (yych <= '/') goto yy247;
-		if (yych >= '5') goto yy280;
+		if (yych <= '/') goto yy246;
+		if (yych >= '5') goto yy288;
 	} else {
-		if (yych <= '9') goto yy252;
-		if (yych <= ':') goto yy279;
-		goto yy247;
+		if (yych <= '9') goto yy251;
+		if (yych <= ':') goto yy287;
+		goto yy246;
 	}
-yy278:
+yy286:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy247;
-	if (yych <= '5') goto yy280;
-	if (yych <= '9') goto yy252;
-	if (yych >= ';') goto yy247;
-yy279:
+	if (yych <= '/') goto yy246;
+	if (yych <= '5') goto yy288;
+	if (yych <= '9') goto yy251;
+	if (yych >= ';') goto yy246;
+yy287:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy247;
-	if (yych <= '5') goto yy280;
-	if (yych <= '9') goto yy252;
-	goto yy247;
-yy280:
+	if (yych <= '/') goto yy246;
+	if (yych <= '5') goto yy288;
+	if (yych <= '9') goto yy251;
+	goto yy246;
+yy288:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy247;
-	if (yych <= '9') goto yy252;
-	goto yy247;
-yy281:
+	if (yych <= '/') goto yy246;
+	if (yych <= '9') goto yy251;
+	goto yy246;
+yy289:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
-		if (yych == ')') goto yy252;
-		if (yych <= '@') goto yy247;
-		goto yy262;
+		if (yych == ')') goto yy251;
+		if (yych <= '@') goto yy246;
+		goto yy263;
 	} else {
 		if (yych <= 'Z') {
-			if (yych >= 'U') goto yy262;
+			if (yych >= 'U') goto yy263;
 		} else {
-			if (yych <= '`') goto yy247;
-			if (yych <= 'z') goto yy262;
-			goto yy247;
+			if (yych <= '`') goto yy246;
+			if (yych <= 'z') goto yy263;
+			goto yy246;
 		}
 	}
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
 		if (yych <= ')') {
-			if (yych <= '(') goto yy247;
-			goto yy252;
+			if (yych <= '(') goto yy246;
+			goto yy251;
 		} else {
-			if (yych == '+') goto yy257;
-			goto yy247;
+			if (yych == '+') goto yy256;
+			goto yy246;
 		}
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '-') goto yy257;
-			if (yych <= '@') goto yy247;
-			goto yy263;
+			if (yych <= '-') goto yy256;
+			if (yych <= '@') goto yy246;
+			goto yy264;
 		} else {
-			if (yych <= '`') goto yy247;
-			if (yych <= 'z') goto yy263;
-			goto yy247;
+			if (yych <= '`') goto yy246;
+			if (yych <= 'z') goto yy264;
+			goto yy246;
 		}
 	}
-yy283:
-	yyaccept = 6;
+yy291:
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy245;
-		goto yy223;
+	if (yych <= ':') {
+		if (yych <= ' ') {
+			if (yych == '\t') goto yy292;
+			if (yych <= 0x1F) goto yy246;
+		} else {
+			if (yych == '.') goto yy248;
+			if (yych <= '9') goto yy246;
+			goto yy248;
+		}
 	} else {
-		if (yych <= '0') goto yy315;
-		if (yych <= '9') goto yy316;
-		if (yych <= ':') goto yy245;
-		goto yy223;
+		if (yych <= 'P') {
+			if (yych == 'A') goto yy294;
+			if (yych <= 'O') goto yy246;
+			goto yy294;
+		} else {
+			if (yych <= 'a') {
+				if (yych <= '`') goto yy246;
+				goto yy294;
+			} else {
+				if (yych == 'p') goto yy294;
+				goto yy246;
+			}
+		}
 	}
-yy284:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy288;
-		goto yy223;
+yy292:
+	++YYCURSOR;
+	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
+	yych = *YYCURSOR;
+	if (yych <= 'A') {
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy292;
+			goto yy56;
+		} else {
+			if (yych <= ' ') goto yy292;
+			if (yych <= '@') goto yy56;
+		}
 	} else {
-		if (yych <= '2') goto yy316;
-		if (yych <= '9') goto yy315;
-		if (yych <= ':') goto yy288;
-		goto yy223;
+		if (yych <= '`') {
+			if (yych != 'P') goto yy56;
+		} else {
+			if (yych <= 'a') goto yy294;
+			if (yych != 'p') goto yy56;
+		}
 	}
-yy285:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy288;
-		goto yy223;
+yy294:
+	yych = *++YYCURSOR;
+	if (yych <= 'L') {
+		if (yych != '.') goto yy56;
 	} else {
-		if (yych <= '4') goto yy315;
-		if (yych <= '9') goto yy287;
-		if (yych <= ':') goto yy288;
-		goto yy223;
+		if (yych <= 'M') goto yy296;
+		if (yych == 'm') goto yy296;
+		goto yy56;
 	}
-yy286:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy288;
-		goto yy223;
+	yych = *++YYCURSOR;
+	if (yych == 'M') goto yy296;
+	if (yych != 'm') goto yy56;
+yy296:
+	yych = *++YYCURSOR;
+	if (yych <= 0x1F) {
+		if (yych <= 0x00) goto yy270;
+		if (yych == '\t') goto yy270;
+		goto yy56;
 	} else {
-		if (yych <= '9') goto yy287;
-		if (yych <= ':') goto yy288;
-		goto yy223;
+		if (yych <= ' ') goto yy270;
+		if (yych != '.') goto yy56;
 	}
-yy287:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy223;
-	if (yych <= '9') goto yy313;
-	goto yy223;
-yy288:
+	if (yych <= '\t') {
+		if (yych <= 0x00) goto yy270;
+		if (yych <= 0x08) goto yy56;
+		goto yy270;
+	} else {
+		if (yych == ' ') goto yy270;
+		goto yy56;
+	}
+yy298:
+	yych = *++YYCURSOR;
+	if (yych == '.') goto yy299;
+	if (yych != ':') goto yy56;
+yy299:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy289;
-	if (yych <= '9') goto yy290;
+	if (yych <= '5') goto yy300;
+	if (yych <= '9') goto yy301;
 	goto yy56;
-yy289:
+yy300:
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy291;
-		goto yy247;
+		if (yych == '.') goto yy302;
+		goto yy246;
 	} else {
-		if (yych <= '9') goto yy306;
-		if (yych <= ':') goto yy291;
-		goto yy247;
+		if (yych <= '9') goto yy301;
+		if (yych <= ':') goto yy302;
+		goto yy246;
 	}
-yy290:
+yy301:
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy291;
-	if (yych != ':') goto yy247;
-yy291:
+	if (yych == '.') goto yy302;
+	if (yych != ':') goto yy246;
+yy302:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy292;
-	if (yych <= '6') goto yy293;
-	if (yych <= '9') goto yy252;
+	if (yych <= '5') goto yy303;
+	if (yych <= '6') goto yy304;
+	if (yych <= '9') goto yy251;
 	goto yy56;
-yy292:
+yy303:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy247;
-	if (yych <= '9') goto yy294;
-	goto yy247;
-yy293:
+	if (yych <= '/') goto yy246;
+	if (yych <= '9') goto yy305;
+	goto yy246;
+yy304:
 	yych = *++YYCURSOR;
-	if (yych != '0') goto yy247;
-yy294:
+	if (yych != '0') goto yy246;
+yy305:
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '*') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy296;
-			goto yy247;
+			if (yych == '\t') goto yy307;
+			goto yy246;
 		} else {
-			if (yych <= ' ') goto yy296;
-			if (yych == '(') goto yy296;
-			goto yy247;
+			if (yych <= ' ') goto yy307;
+			if (yych == '(') goto yy307;
+			goto yy246;
 		}
 	} else {
 		if (yych <= '@') {
-			if (yych == ',') goto yy247;
-			if (yych <= '-') goto yy296;
-			goto yy247;
+			if (yych == ',') goto yy246;
+			if (yych <= '-') goto yy307;
+			goto yy246;
 		} else {
-			if (yych <= 'Z') goto yy296;
-			if (yych <= '`') goto yy247;
-			if (yych <= 'z') goto yy296;
-			goto yy247;
+			if (yych <= 'Z') goto yy307;
+			if (yych <= '`') goto yy246;
+			if (yych <= 'z') goto yy307;
+			goto yy246;
 		}
 	}
-yy295:
+yy306:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
 	yych = *YYCURSOR;
-yy296:
-	if (yych <= '@') {
-		if (yych <= '\'') {
-			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy56;
-				goto yy295;
-			} else {
-				if (yych == ' ') goto yy295;
-				goto yy56;
-			}
+yy307:
+	if (yych <= '+') {
+		if (yych <= ' ') {
+			if (yych == '\t') goto yy306;
+			if (yych <= 0x1F) goto yy56;
+			goto yy306;
 		} else {
-			if (yych <= '+') {
-				if (yych <= '(') goto yy258;
-				if (yych <= '*') goto yy56;
-				goto yy257;
-			} else {
-				if (yych == '-') goto yy257;
-				goto yy56;
-			}
+			if (yych == '(') goto yy257;
+			if (yych <= '*') goto yy56;
+			goto yy256;
 		}
 	} else {
-		if (yych <= 'Z') {
-			if (yych <= 'G') {
-				if (yych <= 'A') goto yy297;
-				if (yych <= 'F') goto yy259;
-				goto yy256;
-			} else {
-				if (yych != 'P') goto yy259;
-			}
+		if (yych <= 'F') {
+			if (yych == '-') goto yy256;
+			if (yych <= '@') goto yy56;
+			goto yy259;
 		} else {
-			if (yych <= 'o') {
-				if (yych <= '`') goto yy56;
-				if (yych <= 'a') goto yy298;
-				goto yy260;
+			if (yych <= 'Z') {
+				if (yych <= 'G') goto yy255;
+				goto yy259;
 			} else {
-				if (yych <= 'p') goto yy298;
-				if (yych <= 'z') goto yy260;
+				if (yych <= '`') goto yy56;
+				if (yych <= 'z') goto yy261;
 				goto yy56;
 			}
 		}
 	}
-yy297:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'L') {
-		if (yych <= '-') {
-			if (yych == ')') goto yy252;
-			goto yy247;
-		} else {
-			if (yych <= '.') goto yy299;
-			if (yych <= '@') goto yy247;
-			goto yy261;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'M') goto yy300;
-			if (yych <= 'Z') goto yy261;
-			goto yy247;
-		} else {
-			if (yych == 'm') goto yy305;
-			if (yych <= 'z') goto yy266;
-			goto yy247;
-		}
-	}
-yy298:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'L') {
-		if (yych <= '-') {
-			if (yych == ')') goto yy252;
-			goto yy247;
-		} else {
-			if (yych <= '.') goto yy299;
-			if (yych <= '@') goto yy247;
-			goto yy261;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'M') goto yy300;
-			if (yych <= 'Z') goto yy261;
-			goto yy247;
-		} else {
-			if (yych == 'm') goto yy300;
-			if (yych <= 'z') goto yy261;
-			goto yy247;
-		}
-	}
-yy299:
-	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy304;
-	if (yych == 'm') goto yy304;
-	goto yy56;
-yy300:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ')') {
-		if (yych <= '\t') {
-			if (yych <= 0x00) goto yy302;
-			if (yych <= 0x08) goto yy247;
-			goto yy302;
-		} else {
-			if (yych == ' ') goto yy302;
-			if (yych <= '(') goto yy247;
-			goto yy252;
-		}
-	} else {
-		if (yych <= '@') {
-			if (yych != '.') goto yy247;
-		} else {
-			if (yych <= 'Z') goto yy262;
-			if (yych <= '`') goto yy247;
-			if (yych <= 'z') goto yy262;
-			goto yy247;
-		}
-	}
-yy301:
+yy308:
 	yych = *++YYCURSOR;
-	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy302;
-		if (yych <= 0x08) goto yy56;
+	if (yych <= '/') {
+		if (yych == '.') goto yy299;
+		goto yy56;
 	} else {
-		if (yych != ' ') goto yy56;
-	}
-yy302:
-	++YYCURSOR;
-#line 1687 "ext/date/lib/parse_date.re"
-	{
-		DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12");
-		TIMELIB_INIT;
-		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-
-		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
-		if (*ptr == ':' || *ptr == '.') {
-			s->time->s = timelib_get_nr((char **) &ptr, 2);
-
-			if (*ptr == '.') {
-				s->time->f = timelib_get_frac_nr((char **) &ptr, 8);
-			}
-		}
-
-		s->time->h += timelib_meridian((char **) &ptr, s->time->h);
-		TIMELIB_DEINIT;
-		return TIMELIB_SHORTDATE_WITH_TIME;
+		if (yych <= '9') goto yy298;
+		if (yych <= ':') goto yy299;
+		goto yy56;
 	}
-#line 5257 "ext/date/lib/parse_date.c"
-yy304:
+yy309:
 	yych = *++YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy302;
-		if (yych == '\t') goto yy302;
+	if (yych <= '/') {
+		if (yych == '.') goto yy299;
 		goto yy56;
 	} else {
-		if (yych <= ' ') goto yy302;
-		if (yych == '.') goto yy301;
+		if (yych <= '4') goto yy298;
+		if (yych == ':') goto yy299;
 		goto yy56;
 	}
-yy305:
-	yyaccept = 7;
+yy310:
+	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '-') {
-		if (yych <= 0x1F) {
-			if (yych <= 0x00) goto yy302;
-			if (yych == '\t') goto yy302;
-			goto yy247;
-		} else {
-			if (yych <= '(') {
-				if (yych <= ' ') goto yy302;
-				goto yy247;
-			} else {
-				if (yych <= ')') goto yy252;
-				if (yych <= ',') goto yy247;
-				goto yy268;
-			}
-		}
+	if (yych <= '/') {
+		if (yych == '.') goto yy299;
+		goto yy232;
 	} else {
-		if (yych <= 'Z') {
-			if (yych <= '.') goto yy301;
-			if (yych <= '/') goto yy268;
-			if (yych <= '@') goto yy247;
-			goto yy262;
-		} else {
-			if (yych <= '_') {
-				if (yych <= '^') goto yy247;
-				goto yy268;
-			} else {
-				if (yych <= '`') goto yy247;
-				if (yych <= 'z') goto yy267;
-				goto yy247;
-			}
-		}
+		if (yych <= '0') goto yy317;
+		if (yych <= '9') goto yy318;
+		if (yych <= ':') goto yy299;
+		goto yy232;
 	}
-yy306:
-	yyaccept = 7;
+yy311:
+	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ':') {
-		if (yych <= ' ') {
-			if (yych == '\t') goto yy307;
-			if (yych <= 0x1F) goto yy247;
-		} else {
-			if (yych == '.') goto yy291;
-			if (yych <= '9') goto yy247;
-			goto yy291;
-		}
-	} else {
-		if (yych <= 'P') {
-			if (yych == 'A') goto yy309;
-			if (yych <= 'O') goto yy247;
-			goto yy309;
-		} else {
-			if (yych <= 'a') {
-				if (yych <= '`') goto yy247;
-				goto yy309;
-			} else {
-				if (yych == 'p') goto yy309;
-				goto yy247;
-			}
-		}
-	}
-yy307:
-	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
-	yych = *YYCURSOR;
-	if (yych <= 'A') {
-		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy307;
-			goto yy56;
-		} else {
-			if (yych <= ' ') goto yy307;
-			if (yych <= '@') goto yy56;
-		}
+	if (yych <= '/') {
+		if (yych == '.') goto yy244;
+		goto yy232;
 	} else {
-		if (yych <= '`') {
-			if (yych != 'P') goto yy56;
-		} else {
-			if (yych <= 'a') goto yy309;
-			if (yych != 'p') goto yy56;
-		}
+		if (yych <= '2') goto yy318;
+		if (yych <= '9') goto yy317;
+		if (yych <= ':') goto yy244;
+		goto yy232;
 	}
-yy309:
-	yych = *++YYCURSOR;
-	if (yych <= 'L') {
-		if (yych != '.') goto yy56;
+yy312:
+	yyaccept = 6;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') {
+		if (yych == '.') goto yy244;
+		goto yy232;
 	} else {
-		if (yych <= 'M') goto yy311;
-		if (yych == 'm') goto yy311;
-		goto yy56;
+		if (yych <= '4') goto yy317;
+		if (yych <= '9') goto yy314;
+		if (yych <= ':') goto yy244;
+		goto yy232;
 	}
-yy310:
-	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy311;
-	if (yych != 'm') goto yy56;
-yy311:
-	yych = *++YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy302;
-		if (yych == '\t') goto yy302;
-		goto yy56;
+yy313:
+	yyaccept = 6;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') {
+		if (yych == '.') goto yy244;
+		goto yy232;
 	} else {
-		if (yych <= ' ') goto yy302;
-		if (yych != '.') goto yy56;
+		if (yych <= '9') goto yy314;
+		if (yych <= ':') goto yy244;
+		goto yy232;
 	}
-yy312:
+yy314:
 	yych = *++YYCURSOR;
-	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy302;
-		if (yych <= 0x08) goto yy56;
-		goto yy302;
-	} else {
-		if (yych == ' ') goto yy302;
-		goto yy56;
-	}
-yy313:
+	if (yych <= '/') goto yy232;
+	if (yych >= ':') goto yy232;
+yy315:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy223;
-	if (yych >= ':') goto yy223;
+	if (yych <= '/') goto yy232;
+	if (yych >= ':') goto yy232;
 	yych = *++YYCURSOR;
-	goto yy223;
-yy315:
+	goto yy232;
+yy317:
 	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy245;
-		goto yy223;
+		if (yych == '.') goto yy299;
+		goto yy232;
 	} else {
-		if (yych <= '9') goto yy313;
-		if (yych <= ':') goto yy245;
-		goto yy223;
+		if (yych <= '9') goto yy315;
+		if (yych <= ':') goto yy299;
+		goto yy232;
 	}
-yy316:
+yy318:
 	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy288;
-		goto yy223;
+		if (yych == '.') goto yy244;
+		goto yy232;
 	} else {
-		if (yych <= '9') goto yy313;
-		if (yych <= ':') goto yy288;
-		goto yy223;
+		if (yych <= '9') goto yy315;
+		if (yych <= ':') goto yy244;
+		goto yy232;
 	}
-yy317:
+yy319:
+	yyaccept = 6;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= 0x00) goto yy238;
+	goto yy237;
+yy320:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
-yy318:
 	++YYCURSOR;
-yy319:
 #line 1381 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
@@ -5425,1160 +5503,232 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
 		s->time->d = 1;
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
-		TIMELIB_DEINIT;
-		return TIMELIB_DATE_NO_DAY;
-	}
-#line 5432 "ext/date/lib/parse_date.c"
-yy320:
-	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '.') goto yy245;
-		goto yy56;
-	} else {
-		if (yych <= '9') goto yy318;
-		if (yych <= ':') goto yy245;
-		goto yy56;
-	}
-yy321:
-	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '.') goto yy288;
-		goto yy56;
-	} else {
-		if (yych <= '9') goto yy318;
-		if (yych <= ':') goto yy288;
-		goto yy56;
-	}
-yy322:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '9') {
-		if (yych <= '/') {
-			if (yych == '.') goto yy355;
-			goto yy240;
-		} else {
-			if (yych <= '0') goto yy356;
-			if (yych <= '1') goto yy326;
-			if (yych <= '2') goto yy327;
-			goto yy321;
-		}
-	} else {
-		if (yych <= 'q') {
-			if (yych <= ':') goto yy245;
-			if (yych == 'n') goto yy236;
-			goto yy240;
-		} else {
-			if (yych <= 'r') goto yy237;
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
-		}
-	}
-yy323:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '9') {
-		if (yych <= '/') {
-			if (yych != '.') goto yy240;
-		} else {
-			if (yych <= '0') goto yy325;
-			if (yych <= '1') goto yy326;
-			if (yych <= '2') goto yy327;
-			goto yy321;
-		}
-	} else {
-		if (yych <= 'q') {
-			if (yych <= ':') goto yy288;
-			if (yych == 'n') goto yy236;
-			goto yy240;
-		} else {
-			if (yych <= 'r') goto yy237;
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
-		}
-	}
-yy324:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '1') {
-		if (yych <= '/') goto yy240;
-		if (yych <= '0') goto yy330;
-		goto yy331;
-	} else {
-		if (yych <= '2') goto yy332;
-		if (yych <= '5') goto yy333;
-		if (yych <= '9') goto yy334;
-		goto yy240;
-	}
-yy325:
-	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '.') goto yy288;
-		goto yy56;
-	} else {
-		if (yych <= '0') goto yy328;
-		if (yych <= '9') goto yy329;
-		if (yych <= ':') goto yy288;
-		goto yy56;
-	}
-yy326:
-	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '.') goto yy288;
-		goto yy56;
-	} else {
-		if (yych <= '2') goto yy329;
-		if (yych <= '9') goto yy328;
-		if (yych <= ':') goto yy288;
-		goto yy56;
-	}
-yy327:
-	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '.') goto yy288;
-		goto yy56;
-	} else {
-		if (yych <= '4') goto yy328;
-		if (yych <= '9') goto yy318;
-		if (yych <= ':') goto yy288;
-		goto yy56;
-	}
-yy328:
-	yyaccept = 8;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy245;
-	if (yych == ':') goto yy245;
-	goto yy319;
-yy329:
-	yyaccept = 8;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy288;
-	if (yych == ':') goto yy288;
-	goto yy319;
-yy330:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy350;
-		goto yy223;
-	} else {
-		if (yych <= '0') goto yy349;
-		if (yych <= '9') goto yy354;
-		if (yych <= ':') goto yy350;
-		goto yy223;
-	}
-yy331:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy335;
-		goto yy223;
-	} else {
-		if (yych <= '2') goto yy354;
-		if (yych <= '9') goto yy349;
-		if (yych <= ':') goto yy335;
-		goto yy223;
-	}
-yy332:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy335;
-		goto yy223;
-	} else {
-		if (yych <= '4') goto yy349;
-		if (yych <= '9') goto yy348;
-		if (yych <= ':') goto yy335;
-		goto yy223;
-	}
-yy333:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy335;
-		goto yy223;
-	} else {
-		if (yych <= '9') goto yy348;
-		if (yych <= ':') goto yy335;
-		goto yy223;
-	}
-yy334:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych != '.') goto yy223;
-	} else {
-		if (yych <= '9') goto yy287;
-		if (yych >= ';') goto yy223;
-	}
-yy335:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy336;
-	if (yych <= '6') goto yy337;
-	if (yych <= '9') goto yy290;
-	goto yy56;
-yy336:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy291;
-		goto yy247;
-	} else {
-		if (yych <= '9') goto yy338;
-		if (yych <= ':') goto yy291;
-		goto yy247;
-	}
-yy337:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy291;
-		goto yy247;
-	} else {
-		if (yych <= '0') goto yy294;
-		if (yych == ':') goto yy291;
-		goto yy247;
-	}
-yy338:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ',') {
-		if (yych <= ' ') {
-			if (yych == '\t') goto yy340;
-			if (yych <= 0x1F) goto yy247;
-			goto yy340;
-		} else {
-			if (yych <= '(') {
-				if (yych <= '\'') goto yy247;
-				goto yy340;
-			} else {
-				if (yych == '+') goto yy340;
-				goto yy247;
-			}
-		}
-	} else {
-		if (yych <= ':') {
-			if (yych <= '-') goto yy340;
-			if (yych <= '.') goto yy291;
-			if (yych <= '9') goto yy247;
-			goto yy291;
-		} else {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy247;
-				goto yy340;
-			} else {
-				if (yych <= '`') goto yy247;
-				if (yych <= 'z') goto yy340;
-				goto yy247;
-			}
-		}
-	}
-yy339:
-	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
-	yych = *YYCURSOR;
-yy340:
-	if (yych <= '@') {
-		if (yych <= '\'') {
-			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy56;
-				goto yy339;
-			} else {
-				if (yych == ' ') goto yy339;
-				goto yy56;
-			}
-		} else {
-			if (yych <= '+') {
-				if (yych <= '(') goto yy258;
-				if (yych <= '*') goto yy56;
-				goto yy257;
-			} else {
-				if (yych == '-') goto yy257;
-				goto yy56;
-			}
-		}
-	} else {
-		if (yych <= 'Z') {
-			if (yych <= 'G') {
-				if (yych <= 'A') goto yy341;
-				if (yych <= 'F') goto yy259;
-				goto yy256;
-			} else {
-				if (yych != 'P') goto yy259;
-			}
-		} else {
-			if (yych <= 'o') {
-				if (yych <= '`') goto yy56;
-				if (yych <= 'a') goto yy342;
-				goto yy260;
-			} else {
-				if (yych <= 'p') goto yy342;
-				if (yych <= 'z') goto yy260;
-				goto yy56;
-			}
-		}
-	}
-yy341:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'L') {
-		if (yych <= '-') {
-			if (yych == ')') goto yy252;
-			goto yy247;
-		} else {
-			if (yych <= '.') goto yy344;
-			if (yych <= '@') goto yy247;
-			goto yy261;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'M') goto yy343;
-			if (yych <= 'Z') goto yy261;
-			goto yy247;
-		} else {
-			if (yych == 'm') goto yy347;
-			if (yych <= 'z') goto yy266;
-			goto yy247;
-		}
-	}
-yy342:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'L') {
-		if (yych <= '-') {
-			if (yych == ')') goto yy252;
-			goto yy247;
-		} else {
-			if (yych <= '.') goto yy344;
-			if (yych <= '@') goto yy247;
-			goto yy261;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'M') goto yy343;
-			if (yych <= 'Z') goto yy261;
-			goto yy247;
-		} else {
-			if (yych == 'm') goto yy343;
-			if (yych <= 'z') goto yy261;
-			goto yy247;
-		}
-	}
-yy343:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ')') {
-		if (yych <= '\t') {
-			if (yych <= 0x00) goto yy302;
-			if (yych <= 0x08) goto yy247;
-			goto yy302;
-		} else {
-			if (yych == ' ') goto yy302;
-			if (yych <= '(') goto yy247;
-			goto yy252;
-		}
-	} else {
-		if (yych <= '@') {
-			if (yych == '.') goto yy346;
-			goto yy247;
-		} else {
-			if (yych <= 'Z') goto yy262;
-			if (yych <= '`') goto yy247;
-			if (yych <= 'z') goto yy262;
-			goto yy247;
-		}
-	}
-yy344:
-	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy345;
-	if (yych != 'm') goto yy56;
-yy345:
-	yych = *++YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy302;
-		if (yych == '\t') goto yy302;
-		goto yy56;
-	} else {
-		if (yych <= ' ') goto yy302;
-		if (yych != '.') goto yy56;
-	}
-yy346:
-	yych = *++YYCURSOR;
-	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy302;
-		if (yych <= 0x08) goto yy56;
-		goto yy302;
-	} else {
-		if (yych == ' ') goto yy302;
-		goto yy56;
-	}
-yy347:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '-') {
-		if (yych <= 0x1F) {
-			if (yych <= 0x00) goto yy302;
-			if (yych == '\t') goto yy302;
-			goto yy247;
-		} else {
-			if (yych <= '(') {
-				if (yych <= ' ') goto yy302;
-				goto yy247;
-			} else {
-				if (yych <= ')') goto yy252;
-				if (yych <= ',') goto yy247;
-				goto yy268;
-			}
-		}
-	} else {
-		if (yych <= 'Z') {
-			if (yych <= '.') goto yy346;
-			if (yych <= '/') goto yy268;
-			if (yych <= '@') goto yy247;
-			goto yy262;
-		} else {
-			if (yych <= '_') {
-				if (yych <= '^') goto yy247;
-				goto yy268;
-			} else {
-				if (yych <= '`') goto yy247;
-				if (yych <= 'z') goto yy267;
-				goto yy247;
-			}
-		}
-	}
-yy348:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ':') {
-		if (yych <= ' ') {
-			if (yych == '\t') goto yy307;
-			if (yych <= 0x1F) goto yy223;
-			goto yy307;
-		} else {
-			if (yych <= '.') {
-				if (yych <= '-') goto yy223;
-				goto yy291;
-			} else {
-				if (yych <= '/') goto yy223;
-				if (yych <= '9') goto yy313;
-				goto yy291;
-			}
-		}
-	} else {
-		if (yych <= 'P') {
-			if (yych == 'A') goto yy309;
-			if (yych <= 'O') goto yy223;
-			goto yy309;
-		} else {
-			if (yych <= 'a') {
-				if (yych <= '`') goto yy223;
-				goto yy309;
-			} else {
-				if (yych == 'p') goto yy309;
-				goto yy223;
-			}
-		}
-	}
-yy349:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ':') {
-		if (yych <= ' ') {
-			if (yych == '\t') goto yy307;
-			if (yych <= 0x1F) goto yy223;
-			goto yy307;
-		} else {
-			if (yych <= '.') {
-				if (yych <= '-') goto yy223;
-			} else {
-				if (yych <= '/') goto yy223;
-				if (yych <= '9') goto yy313;
-			}
-		}
-	} else {
-		if (yych <= 'P') {
-			if (yych == 'A') goto yy309;
-			if (yych <= 'O') goto yy223;
-			goto yy309;
-		} else {
-			if (yych <= 'a') {
-				if (yych <= '`') goto yy223;
-				goto yy309;
-			} else {
-				if (yych == 'p') goto yy309;
-				goto yy223;
-			}
-		}
-	}
-yy350:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy351;
-	if (yych <= '6') goto yy352;
-	if (yych <= '9') goto yy248;
-	goto yy56;
-yy351:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy249;
-		goto yy247;
-	} else {
-		if (yych <= '9') goto yy353;
-		if (yych <= ':') goto yy249;
-		goto yy247;
-	}
-yy352:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy249;
-		goto yy247;
-	} else {
-		if (yych <= '0') goto yy294;
-		if (yych == ':') goto yy249;
-		goto yy247;
-	}
-yy353:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ',') {
-		if (yych <= ' ') {
-			if (yych == '\t') goto yy296;
-			if (yych <= 0x1F) goto yy247;
-			goto yy296;
-		} else {
-			if (yych <= '(') {
-				if (yych <= '\'') goto yy247;
-				goto yy296;
-			} else {
-				if (yych == '+') goto yy296;
-				goto yy247;
-			}
-		}
-	} else {
-		if (yych <= ':') {
-			if (yych <= '-') goto yy296;
-			if (yych <= '.') goto yy249;
-			if (yych <= '9') goto yy247;
-			goto yy249;
-		} else {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy247;
-				goto yy296;
-			} else {
-				if (yych <= '`') goto yy247;
-				if (yych <= 'z') goto yy296;
-				goto yy247;
-			}
-		}
-	}
-yy354:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ':') {
-		if (yych <= ' ') {
-			if (yych == '\t') goto yy307;
-			if (yych <= 0x1F) goto yy223;
-			goto yy307;
-		} else {
-			if (yych <= '.') {
-				if (yych <= '-') goto yy223;
-				goto yy335;
-			} else {
-				if (yych <= '/') goto yy223;
-				if (yych <= '9') goto yy313;
-				goto yy335;
-			}
-		}
-	} else {
-		if (yych <= 'P') {
-			if (yych == 'A') goto yy309;
-			if (yych <= 'O') goto yy223;
-			goto yy309;
-		} else {
-			if (yych <= 'a') {
-				if (yych <= '`') goto yy223;
-				goto yy309;
-			} else {
-				if (yych == 'p') goto yy309;
-				goto yy223;
-			}
-		}
-	}
-yy355:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '1') {
-		if (yych <= '/') goto yy240;
-		if (yych <= '0') goto yy357;
-		goto yy358;
-	} else {
-		if (yych <= '2') goto yy359;
-		if (yych <= '5') goto yy360;
-		if (yych <= '9') goto yy361;
-		goto yy240;
-	}
-yy356:
-	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '.') goto yy245;
-		goto yy56;
-	} else {
-		if (yych <= '0') goto yy328;
-		if (yych <= '9') goto yy329;
-		if (yych <= ':') goto yy245;
-		goto yy56;
-	}
-yy357:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy374;
-		goto yy223;
-	} else {
-		if (yych <= '0') goto yy373;
-		if (yych <= '9') goto yy378;
-		if (yych <= ':') goto yy374;
-		goto yy223;
-	}
-yy358:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy362;
-		goto yy223;
-	} else {
-		if (yych <= '2') goto yy378;
-		if (yych <= '9') goto yy373;
-		if (yych <= ':') goto yy362;
-		goto yy223;
-	}
-yy359:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy362;
-		goto yy223;
-	} else {
-		if (yych <= '4') goto yy373;
-		if (yych <= '9') goto yy372;
-		if (yych <= ':') goto yy362;
-		goto yy223;
-	}
-yy360:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy362;
-		goto yy223;
-	} else {
-		if (yych <= '9') goto yy372;
-		if (yych <= ':') goto yy362;
-		goto yy223;
-	}
-yy361:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych != '.') goto yy223;
-	} else {
-		if (yych <= '9') goto yy287;
-		if (yych >= ';') goto yy223;
-	}
-yy362:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy363;
-	if (yych <= '6') goto yy364;
-	if (yych <= '9') goto yy290;
-	goto yy56;
-yy363:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy291;
-		goto yy247;
-	} else {
-		if (yych <= '9') goto yy365;
-		if (yych <= ':') goto yy291;
-		goto yy247;
-	}
-yy364:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy291;
-		goto yy247;
-	} else {
-		if (yych <= '0') goto yy253;
-		if (yych == ':') goto yy291;
-		goto yy247;
-	}
-yy365:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ',') {
-		if (yych <= ' ') {
-			if (yych == '\t') goto yy367;
-			if (yych <= 0x1F) goto yy247;
-			goto yy367;
-		} else {
-			if (yych <= '(') {
-				if (yych <= '\'') goto yy247;
-				goto yy367;
-			} else {
-				if (yych == '+') goto yy367;
-				goto yy247;
-			}
-		}
-	} else {
-		if (yych <= ':') {
-			if (yych <= '-') goto yy367;
-			if (yych <= '.') goto yy291;
-			if (yych <= '9') goto yy247;
-			goto yy291;
-		} else {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy247;
-				goto yy367;
-			} else {
-				if (yych <= '`') goto yy247;
-				if (yych <= 'z') goto yy367;
-				goto yy247;
-			}
-		}
-	}
-yy366:
-	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
-	yych = *YYCURSOR;
-yy367:
-	if (yych <= '@') {
-		if (yych <= '\'') {
-			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy56;
-				goto yy366;
-			} else {
-				if (yych == ' ') goto yy366;
-				goto yy56;
-			}
-		} else {
-			if (yych <= '+') {
-				if (yych <= '(') goto yy258;
-				if (yych <= '*') goto yy56;
-				goto yy257;
-			} else {
-				if (yych == '-') goto yy257;
-				goto yy56;
-			}
-		}
-	} else {
-		if (yych <= 'Z') {
-			if (yych <= 'G') {
-				if (yych <= 'A') goto yy368;
-				if (yych <= 'F') goto yy259;
-				goto yy256;
-			} else {
-				if (yych != 'P') goto yy259;
-			}
-		} else {
-			if (yych <= 'o') {
-				if (yych <= '`') goto yy56;
-				if (yych <= 'a') goto yy369;
-				goto yy260;
-			} else {
-				if (yych <= 'p') goto yy369;
-				if (yych <= 'z') goto yy260;
-				goto yy56;
-			}
-		}
-	}
-yy368:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'L') {
-		if (yych <= '-') {
-			if (yych == ')') goto yy252;
-			goto yy247;
-		} else {
-			if (yych <= '.') goto yy310;
-			if (yych <= '@') goto yy247;
-			goto yy261;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'M') goto yy370;
-			if (yych <= 'Z') goto yy261;
-			goto yy247;
-		} else {
-			if (yych == 'm') goto yy371;
-			if (yych <= 'z') goto yy266;
-			goto yy247;
-		}
-	}
-yy369:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'L') {
-		if (yych <= '-') {
-			if (yych == ')') goto yy252;
-			goto yy247;
-		} else {
-			if (yych <= '.') goto yy310;
-			if (yych <= '@') goto yy247;
-			goto yy261;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'M') goto yy370;
-			if (yych <= 'Z') goto yy261;
-			goto yy247;
-		} else {
-			if (yych == 'm') goto yy370;
-			if (yych <= 'z') goto yy261;
-			goto yy247;
-		}
-	}
-yy370:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ')') {
-		if (yych <= '\t') {
-			if (yych <= 0x00) goto yy302;
-			if (yych <= 0x08) goto yy247;
-			goto yy302;
-		} else {
-			if (yych == ' ') goto yy302;
-			if (yych <= '(') goto yy247;
-			goto yy252;
-		}
-	} else {
-		if (yych <= '@') {
-			if (yych == '.') goto yy312;
-			goto yy247;
-		} else {
-			if (yych <= 'Z') goto yy262;
-			if (yych <= '`') goto yy247;
-			if (yych <= 'z') goto yy262;
-			goto yy247;
-		}
-	}
-yy371:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '-') {
-		if (yych <= 0x1F) {
-			if (yych <= 0x00) goto yy302;
-			if (yych == '\t') goto yy302;
-			goto yy247;
-		} else {
-			if (yych <= '(') {
-				if (yych <= ' ') goto yy302;
-				goto yy247;
-			} else {
-				if (yych <= ')') goto yy252;
-				if (yych <= ',') goto yy247;
-				goto yy268;
-			}
-		}
-	} else {
-		if (yych <= 'Z') {
-			if (yych <= '.') goto yy312;
-			if (yych <= '/') goto yy268;
-			if (yych <= '@') goto yy247;
-			goto yy262;
-		} else {
-			if (yych <= '_') {
-				if (yych <= '^') goto yy247;
-				goto yy268;
-			} else {
-				if (yych <= '`') goto yy247;
-				if (yych <= 'z') goto yy267;
-				goto yy247;
-			}
-		}
-	}
-yy372:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy249;
-		goto yy223;
-	} else {
-		if (yych <= '9') goto yy313;
-		if (yych <= ':') goto yy249;
-		goto yy223;
-	}
-yy373:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych != '.') goto yy223;
-	} else {
-		if (yych <= '9') goto yy313;
-		if (yych >= ';') goto yy223;
-	}
-yy374:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy375;
-	if (yych <= '6') goto yy376;
-	if (yych <= '9') goto yy248;
-	goto yy56;
-yy375:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy249;
-		goto yy247;
-	} else {
-		if (yych <= '9') goto yy377;
-		if (yych <= ':') goto yy249;
-		goto yy247;
-	}
-yy376:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy249;
-		goto yy247;
-	} else {
-		if (yych <= '0') goto yy253;
-		if (yych == ':') goto yy249;
-		goto yy247;
-	}
-yy377:
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ',') {
-		if (yych <= ' ') {
-			if (yych == '\t') goto yy255;
-			if (yych <= 0x1F) goto yy247;
-			goto yy255;
-		} else {
-			if (yych <= '(') {
-				if (yych <= '\'') goto yy247;
-				goto yy255;
-			} else {
-				if (yych == '+') goto yy255;
-				goto yy247;
-			}
-		}
-	} else {
-		if (yych <= ':') {
-			if (yych <= '-') goto yy255;
-			if (yych <= '.') goto yy249;
-			if (yych <= '9') goto yy247;
-			goto yy249;
-		} else {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy247;
-				goto yy255;
-			} else {
-				if (yych <= '`') goto yy247;
-				if (yych <= 'z') goto yy255;
-				goto yy247;
-			}
-		}
-	}
-yy378:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy362;
-		goto yy223;
-	} else {
-		if (yych <= '9') goto yy313;
-		if (yych <= ':') goto yy362;
-		goto yy223;
-	}
-yy379:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '9') {
-		if (yych <= '/') {
-			if (yych == '.') goto yy324;
-			goto yy240;
-		} else {
-			if (yych <= '0') goto yy356;
-			if (yych <= '1') goto yy326;
-			if (yych <= '2') goto yy327;
-			goto yy321;
-		}
-	} else {
-		if (yych <= 'q') {
-			if (yych <= ':') goto yy288;
-			if (yych == 'n') goto yy236;
-			goto yy240;
-		} else {
-			if (yych <= 'r') goto yy237;
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
-		}
-	}
-yy380:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '9') {
-		if (yych <= '/') {
-			if (yych == '.') goto yy324;
-			goto yy240;
-		} else {
-			if (yych <= '0') goto yy356;
-			if (yych <= '1') goto yy326;
-			if (yych <= '2') goto yy327;
-			goto yy321;
-		}
-	} else {
-		if (yych <= 'q') {
-			if (yych <= ':') goto yy288;
-			if (yych == 'n') goto yy236;
-			goto yy240;
-		} else {
-			if (yych <= 'r') goto yy237;
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
-		}
-	}
-yy381:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'm') {
-		if (yych <= '1') {
-			if (yych <= '/') goto yy240;
-			if (yych <= '0') goto yy384;
-			goto yy385;
+		TIMELIB_DEINIT;
+		return TIMELIB_DATE_NO_DAY;
+	}
+#line 5510 "ext/date/lib/parse_date.c"
+yy323:
+	yych = *++YYCURSOR;
+	if (yych <= '9') {
+		if (yych <= ' ') {
+			if (yych <= 0x08) {
+				if (yych <= 0x00) goto yy238;
+				goto yy56;
+			} else {
+				if (yych <= '\t') goto yy236;
+				if (yych <= 0x1F) goto yy56;
+				goto yy236;
+			}
 		} else {
-			if (yych <= '2') goto yy392;
-			if (yych <= '9') goto yy393;
-			goto yy240;
+			if (yych <= '-') {
+				if (yych == ',') goto yy236;
+				goto yy56;
+			} else {
+				if (yych <= '.') goto yy236;
+				if (yych <= '/') goto yy56;
+				goto yy320;
+			}
 		}
 	} else {
-		if (yych <= 'r') {
-			if (yych <= 'n') goto yy236;
-			if (yych <= 'q') goto yy240;
-			goto yy237;
+		if (yych <= 'm') {
+			if (yych <= 'd') {
+				if (yych <= 'c') goto yy56;
+				goto yy236;
+			} else {
+				if (yych == 'h') goto yy236;
+				goto yy56;
+			}
 		} else {
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
+			if (yych <= 'r') {
+				if (yych <= 'n') goto yy233;
+				if (yych <= 'q') goto yy56;
+				goto yy234;
+			} else {
+				if (yych <= 's') goto yy231;
+				if (yych <= 't') goto yy235;
+				goto yy56;
+			}
 		}
 	}
-yy382:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'm') {
-		if (yych <= '1') {
-			if (yych <= '/') goto yy240;
-			if (yych <= '0') goto yy384;
-			goto yy385;
+yy324:
+	yych = *++YYCURSOR;
+	if (yych <= '9') {
+		if (yych <= ' ') {
+			if (yych <= 0x08) {
+				if (yych <= 0x00) goto yy238;
+				goto yy56;
+			} else {
+				if (yych <= '\t') goto yy236;
+				if (yych <= 0x1F) goto yy56;
+				goto yy236;
+			}
 		} else {
-			if (yych <= '2') goto yy392;
-			if (yych <= '9') goto yy393;
-			goto yy240;
+			if (yych <= '-') {
+				if (yych == ',') goto yy236;
+				goto yy56;
+			} else {
+				if (yych <= '.') goto yy236;
+				if (yych <= '/') goto yy56;
+				goto yy327;
+			}
 		}
 	} else {
-		if (yych <= 'r') {
-			if (yych <= 'n') goto yy236;
-			if (yych <= 'q') goto yy240;
-			goto yy237;
+		if (yych <= 'm') {
+			if (yych <= 'd') {
+				if (yych <= 'c') goto yy56;
+				goto yy236;
+			} else {
+				if (yych == 'h') goto yy236;
+				goto yy56;
+			}
 		} else {
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
+			if (yych <= 'r') {
+				if (yych <= 'n') goto yy233;
+				if (yych <= 'q') goto yy56;
+				goto yy234;
+			} else {
+				if (yych <= 's') goto yy231;
+				if (yych <= 't') goto yy235;
+				goto yy56;
+			}
 		}
 	}
-yy383:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'm') {
-		if (yych <= '1') {
-			if (yych <= '/') goto yy240;
-			if (yych >= '1') goto yy385;
+yy325:
+	yych = *++YYCURSOR;
+	if (yych <= '9') {
+		if (yych <= ' ') {
+			if (yych <= 0x08) {
+				if (yych <= 0x00) goto yy238;
+				goto yy56;
+			} else {
+				if (yych <= '\t') goto yy236;
+				if (yych <= 0x1F) goto yy56;
+				goto yy236;
+			}
 		} else {
-			if (yych <= '2') goto yy233;
-			if (yych <= '9') goto yy234;
-			goto yy240;
+			if (yych <= '-') {
+				if (yych == ',') goto yy236;
+				goto yy56;
+			} else {
+				if (yych <= '.') goto yy236;
+				if (yych <= '/') goto yy56;
+				goto yy327;
+			}
 		}
 	} else {
-		if (yych <= 'r') {
-			if (yych <= 'n') goto yy236;
-			if (yych <= 'q') goto yy240;
-			goto yy237;
+		if (yych <= 'm') {
+			if (yych <= 'd') {
+				if (yych <= 'c') goto yy56;
+				goto yy236;
+			} else {
+				if (yych == 'h') goto yy236;
+				goto yy56;
+			}
 		} else {
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
+			if (yych <= 'r') {
+				if (yych <= 'n') goto yy233;
+				if (yych <= 'q') goto yy56;
+				goto yy234;
+			} else {
+				if (yych <= 's') goto yy231;
+				if (yych <= 't') goto yy235;
+				goto yy56;
+			}
 		}
 	}
-yy384:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '9') {
-		if (yych <= '/') {
-			if (yych <= ',') goto yy240;
-			if (yych <= '-') goto yy386;
-			if (yych <= '.') goto yy355;
-			goto yy240;
+yy326:
+	yych = *++YYCURSOR;
+	if (yych <= '1') {
+		if (yych <= ' ') {
+			if (yych <= 0x08) {
+				if (yych <= 0x00) goto yy238;
+				goto yy56;
+			} else {
+				if (yych <= '\t') goto yy236;
+				if (yych <= 0x1F) goto yy56;
+				goto yy236;
+			}
 		} else {
-			if (yych <= '0') goto yy356;
-			if (yych <= '1') goto yy326;
-			if (yych <= '2') goto yy327;
-			goto yy321;
+			if (yych <= '-') {
+				if (yych == ',') goto yy236;
+				goto yy56;
+			} else {
+				if (yych <= '.') goto yy236;
+				if (yych <= '/') goto yy56;
+			}
 		}
 	} else {
-		if (yych <= 'q') {
-			if (yych <= ':') goto yy245;
-			if (yych == 'n') goto yy236;
-			goto yy240;
+		if (yych <= 'm') {
+			if (yych <= 'd') {
+				if (yych <= '9') goto yy230;
+				if (yych <= 'c') goto yy56;
+				goto yy236;
+			} else {
+				if (yych == 'h') goto yy236;
+				goto yy56;
+			}
 		} else {
-			if (yych <= 'r') goto yy237;
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
+			if (yych <= 'r') {
+				if (yych <= 'n') goto yy233;
+				if (yych <= 'q') goto yy56;
+				goto yy234;
+			} else {
+				if (yych <= 's') goto yy231;
+				if (yych <= 't') goto yy235;
+				goto yy56;
+			}
 		}
 	}
-yy385:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
+yy327:
+	yych = *++YYCURSOR;
 	if (yych <= '9') {
-		if (yych <= '/') {
-			if (yych <= ',') goto yy240;
-			if (yych <= '-') goto yy386;
-			if (yych <= '.') goto yy324;
-			goto yy240;
+		if (yych <= ' ') {
+			if (yych <= 0x08) {
+				if (yych <= 0x00) goto yy238;
+				goto yy56;
+			} else {
+				if (yych <= '\t') goto yy236;
+				if (yych <= 0x1F) goto yy56;
+				goto yy236;
+			}
 		} else {
-			if (yych <= '0') goto yy325;
-			if (yych <= '1') goto yy326;
-			if (yych <= '2') goto yy327;
-			goto yy321;
+			if (yych <= '-') {
+				if (yych <= '+') goto yy56;
+				if (yych <= ',') goto yy236;
+			} else {
+				if (yych <= '.') goto yy236;
+				if (yych <= '/') goto yy56;
+				goto yy320;
+			}
 		}
 	} else {
-		if (yych <= 'q') {
-			if (yych <= ':') goto yy288;
-			if (yych == 'n') goto yy236;
-			goto yy240;
+		if (yych <= 'm') {
+			if (yych <= 'd') {
+				if (yych <= 'c') goto yy56;
+				goto yy236;
+			} else {
+				if (yych == 'h') goto yy236;
+				goto yy56;
+			}
 		} else {
-			if (yych <= 'r') goto yy237;
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
+			if (yych <= 'r') {
+				if (yych <= 'n') goto yy233;
+				if (yych <= 'q') goto yy56;
+				goto yy234;
+			} else {
+				if (yych <= 's') goto yy231;
+				if (yych <= 't') goto yy235;
+				goto yy56;
+			}
 		}
 	}
-yy386:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
 	++YYCURSOR;
-	if ((yych = *YYCURSOR) <= '/') goto yy388;
-	if (yych <= '9') goto yy389;
-yy388:
+	if ((yych = *YYCURSOR) <= '/') goto yy330;
+	if (yych <= '9') goto yy331;
+yy330:
 #line 1525 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
@@ -6592,71 +5742,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 6596 "ext/date/lib/parse_date.c"
-yy389:
+#line 5746 "ext/date/lib/parse_date.c"
+yy331:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy388;
-	if (yych >= ':') goto yy388;
+	if (yych <= '/') goto yy330;
+	if (yych >= ':') goto yy330;
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy388;
-	if (yych >= ':') goto yy388;
+	if (yych <= '/') goto yy330;
+	if (yych >= ':') goto yy330;
 	yych = *++YYCURSOR;
-	goto yy388;
-yy392:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '9') {
-		if (yych <= '/') {
-			if (yych <= ',') goto yy240;
-			if (yych <= '-') goto yy386;
-			if (yych <= '.') goto yy324;
-			goto yy240;
-		} else {
-			if (yych <= '0') goto yy356;
-			if (yych <= '1') goto yy326;
-			if (yych <= '2') goto yy327;
-			goto yy321;
-		}
-	} else {
-		if (yych <= 'q') {
-			if (yych <= ':') goto yy288;
-			if (yych == 'n') goto yy236;
-			goto yy240;
-		} else {
-			if (yych <= 'r') goto yy237;
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
-		}
-	}
-yy393:
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '9') {
-		if (yych <= '/') {
-			if (yych <= ',') goto yy240;
-			if (yych <= '-') goto yy386;
-			if (yych <= '.') goto yy324;
-			goto yy240;
-		} else {
-			if (yych <= '0') goto yy356;
-			if (yych <= '1') goto yy326;
-			if (yych <= '2') goto yy327;
-			goto yy321;
-		}
-	} else {
-		if (yych <= 'q') {
-			if (yych <= ':') goto yy288;
-			if (yych == 'n') goto yy236;
-			goto yy240;
-		} else {
-			if (yych <= 'r') goto yy237;
-			if (yych <= 's') goto yy235;
-			if (yych <= 't') goto yy238;
-			goto yy240;
-		}
-	}
-yy394:
+	goto yy330;
+yy334:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'B') {
@@ -6680,13 +5776,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'c') goto yy395;
+				if (yych <= 'c') goto yy335;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy395:
+yy335:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -6713,7 +5809,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'E') goto yy226;
+				if (yych <= 'E') goto yy225;
 				if (yych <= 'Z') goto yy167;
 				goto yy218;
 			}
@@ -6723,23 +5819,23 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy175;
 			} else {
-				if (yych <= 'e') goto yy397;
+				if (yych <= 'e') goto yy337;
 				if (yych <= 'z') goto yy175;
 				goto yy218;
 			}
 		}
 	}
-yy396:
+yy336:
 	yych = *++YYCURSOR;
 	if (yybm[0+yych] & 8) {
 		goto yy173;
 	}
 	if (yych <= '/') goto yy220;
-	if (yych <= '0') goto yy381;
-	if (yych <= '2') goto yy382;
-	if (yych <= '3') goto yy383;
+	if (yych <= '0') goto yy324;
+	if (yych <= '2') goto yy325;
+	if (yych <= '3') goto yy326;
 	goto yy220;
-yy397:
+yy337:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'L') {
@@ -6754,7 +5850,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'M') goto yy227;
+			if (yych <= 'M') goto yy226;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -6763,13 +5859,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'm') goto yy398;
+				if (yych <= 'm') goto yy338;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy398:
+yy338:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'A') {
@@ -6784,7 +5880,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'B') goto yy228;
+			if (yych <= 'B') goto yy227;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -6793,13 +5889,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'b') goto yy399;
+				if (yych <= 'b') goto yy339;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy399:
+yy339:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -6813,20 +5909,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'E') goto yy229;
+			if (yych <= 'E') goto yy228;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 'e') goto yy400;
+			if (yych == 'e') goto yy340;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy400:
+yy340:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy230;
+	if (yych == 'R') goto yy229;
 	if (yych != 'r') goto yy179;
-yy401:
+yy341:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 16) {
@@ -6849,13 +5945,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy218;
 		}
 	}
-yy402:
+yy342:
 	yych = *++YYCURSOR;
 	if (yybm[0+yych] & 8) {
 		goto yy173;
 	}
 	goto yy220;
-yy403:
+yy343:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -6871,12 +5967,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 't') goto yy404;
+			if (yych <= 't') goto yy344;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy404:
+yy344:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -6911,13 +6007,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'o') goto yy405;
+				if (yych <= 'o') goto yy345;
 				if (yych <= 'z') goto yy167;
 				goto yy218;
 			}
 		}
 	}
-yy405:
+yy345:
 	yych = *++YYCURSOR;
 	if (yych <= 'B') {
 		if (yych <= ')') {
@@ -6933,12 +6029,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'b') goto yy406;
+			if (yych <= 'b') goto yy346;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy406:
+yy346:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -6954,22 +6050,22 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'e') goto yy407;
+			if (yych <= 'e') goto yy347;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy407:
+yy347:
 	yych = *++YYCURSOR;
 	if (yych <= 'Q') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'R') goto yy230;
-		if (yych == 'r') goto yy230;
+		if (yych <= 'R') goto yy229;
+		if (yych == 'r') goto yy229;
 		goto yy3;
 	}
-yy408:
+yy348:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -6984,7 +6080,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy404;
+			if (yych <= 'T') goto yy344;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -6993,13 +6089,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 't') goto yy409;
+				if (yych <= 't') goto yy349;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy409:
+yy349:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -7015,7 +6111,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '-') {
 				if (yych <= ')') goto yy164;
 				if (yych <= ',') goto yy218;
-				goto yy396;
+				goto yy336;
 			} else {
 				if (yych == '/') goto yy172;
 				goto yy220;
@@ -7027,7 +6123,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'O') goto yy405;
+				if (yych <= 'O') goto yy345;
 				if (yych <= 'Z') goto yy167;
 				goto yy218;
 			}
@@ -7037,13 +6133,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy175;
 			} else {
-				if (yych <= 'o') goto yy410;
+				if (yych <= 'o') goto yy350;
 				if (yych <= 'z') goto yy175;
 				goto yy218;
 			}
 		}
 	}
-yy410:
+yy350:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'A') {
@@ -7058,7 +6154,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'B') goto yy406;
+			if (yych <= 'B') goto yy346;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -7067,13 +6163,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'b') goto yy411;
+				if (yych <= 'b') goto yy351;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy411:
+yy351:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -7088,7 +6184,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy407;
+			if (yych <= 'E') goto yy347;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -7097,13 +6193,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'e') goto yy412;
+				if (yych <= 'e') goto yy352;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy412:
+yy352:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -7117,16 +6213,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'R') goto yy230;
+			if (yych <= 'R') goto yy229;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 'r') goto yy401;
+			if (yych == 'r') goto yy341;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy413:
+yy353:
 	yych = *++YYCURSOR;
 	if (yych <= 'G') {
 		if (yych <= ')') {
@@ -7135,7 +6231,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'F') goto yy166;
-			goto yy421;
+			goto yy361;
 		}
 	} else {
 		if (yych <= 'f') {
@@ -7143,12 +6239,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'g') goto yy421;
+			if (yych <= 'g') goto yy361;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy414:
+yy354:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -7157,7 +6253,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'Q') goto yy166;
-			goto yy418;
+			goto yy358;
 		}
 	} else {
 		if (yych <= 'q') {
@@ -7165,12 +6261,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'r') goto yy418;
+			if (yych <= 'r') goto yy358;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy415:
+yy355:
 	yych = *++YYCURSOR;
 	if (yych <= 'O') {
 		if (yych <= ')') {
@@ -7186,21 +6282,21 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'o') goto yy416;
+			if (yych <= 'o') goto yy356;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy416:
+yy356:
 	++YYCURSOR;
 	if ((yych = *YYCURSOR) <= '@') {
 		if (yych == ')') goto yy164;
 	} else {
 		if (yych <= 'Z') goto yy167;
-		if (yych <= '`') goto yy417;
+		if (yych <= '`') goto yy357;
 		if (yych <= 'z') goto yy167;
 	}
-yy417:
+yy357:
 #line 1583 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("ago");
@@ -7221,8 +6317,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_AGO;
 	}
-#line 7225 "ext/date/lib/parse_date.c"
-yy418:
+#line 6321 "ext/date/lib/parse_date.c"
+yy358:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -7257,13 +6353,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'i') goto yy419;
+				if (yych <= 'i') goto yy359;
 				if (yych <= 'z') goto yy167;
 				goto yy218;
 			}
 		}
 	}
-yy419:
+yy359:
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
 		if (yych <= ')') {
@@ -7279,12 +6375,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'l') goto yy420;
+			if (yych <= 'l') goto yy360;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy420:
+yy360:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
@@ -7308,7 +6404,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy218;
 		}
 	}
-yy421:
+yy361:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -7343,13 +6439,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'u') goto yy422;
+				if (yych <= 'u') goto yy362;
 				if (yych <= 'z') goto yy167;
 				goto yy218;
 			}
 		}
 	}
-yy422:
+yy362:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -7365,12 +6461,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 's') goto yy423;
+			if (yych <= 's') goto yy363;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy423:
+yy363:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -7386,12 +6482,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 't') goto yy424;
+			if (yych <= 't') goto yy364;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy424:
+yy364:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '(') {
@@ -7413,7 +6509,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy218;
 		}
 	}
-yy425:
+yy365:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'F') {
@@ -7428,7 +6524,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'G') goto yy421;
+			if (yych <= 'G') goto yy361;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -7437,13 +6533,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'g') goto yy432;
+				if (yych <= 'g') goto yy372;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy426:
+yy366:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -7458,7 +6554,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy418;
+			if (yych <= 'R') goto yy358;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -7467,13 +6563,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'r') goto yy429;
+				if (yych <= 'r') goto yy369;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy427:
+yy367:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
@@ -7488,7 +6584,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'O') goto yy416;
+			if (yych <= 'O') goto yy356;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -7497,36 +6593,36 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'o') goto yy428;
+				if (yych <= 'o') goto yy368;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy428:
-	yyaccept = 9;
+yy368:
+	yyaccept = 8;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
 			if (yych == ')') goto yy164;
-			goto yy417;
+			goto yy357;
 		} else {
-			if (yych == '.') goto yy417;
+			if (yych == '.') goto yy357;
 			goto yy172;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy417;
+			if (yych <= '@') goto yy357;
 			if (yych <= 'Z') goto yy167;
-			goto yy417;
+			goto yy357;
 		} else {
 			if (yych <= '_') goto yy172;
-			if (yych <= '`') goto yy417;
+			if (yych <= '`') goto yy357;
 			if (yych <= 'z') goto yy175;
-			goto yy417;
+			goto yy357;
 		}
 	}
-yy429:
+yy369:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -7542,7 +6638,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '-') {
 				if (yych <= ')') goto yy164;
 				if (yych <= ',') goto yy218;
-				goto yy396;
+				goto yy336;
 			} else {
 				if (yych == '/') goto yy172;
 				goto yy220;
@@ -7554,7 +6650,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'I') goto yy419;
+				if (yych <= 'I') goto yy359;
 				if (yych <= 'Z') goto yy167;
 				goto yy218;
 			}
@@ -7564,13 +6660,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy175;
 			} else {
-				if (yych <= 'i') goto yy430;
+				if (yych <= 'i') goto yy370;
 				if (yych <= 'z') goto yy175;
 				goto yy218;
 			}
 		}
 	}
-yy430:
+yy370:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'K') {
@@ -7585,7 +6681,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'L') goto yy420;
+			if (yych <= 'L') goto yy360;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -7594,13 +6690,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'l') goto yy431;
+				if (yych <= 'l') goto yy371;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy431:
+yy371:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -7614,7 +6710,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				goto yy164;
 			} else {
 				if (yych <= ',') goto yy218;
-				if (yych <= '-') goto yy402;
+				if (yych <= '-') goto yy342;
 				goto yy220;
 			}
 		}
@@ -7635,7 +6731,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy432:
+yy372:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -7651,7 +6747,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '-') {
 				if (yych <= ')') goto yy164;
 				if (yych <= ',') goto yy218;
-				goto yy396;
+				goto yy336;
 			} else {
 				if (yych == '/') goto yy172;
 				goto yy220;
@@ -7663,7 +6759,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'U') goto yy422;
+				if (yych <= 'U') goto yy362;
 				if (yych <= 'Z') goto yy167;
 				goto yy218;
 			}
@@ -7673,13 +6769,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy175;
 			} else {
-				if (yych <= 'u') goto yy433;
+				if (yych <= 'u') goto yy373;
 				if (yych <= 'z') goto yy175;
 				goto yy218;
 			}
 		}
 	}
-yy433:
+yy373:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
@@ -7694,7 +6790,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy423;
+			if (yych <= 'S') goto yy363;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -7703,13 +6799,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 's') goto yy434;
+				if (yych <= 's') goto yy374;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy434:
+yy374:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -7724,7 +6820,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy424;
+			if (yych <= 'T') goto yy364;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -7733,13 +6829,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 't') goto yy435;
+				if (yych <= 't') goto yy375;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy435:
+yy375:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 16) {
@@ -7756,7 +6852,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '/') {
-			if (yych <= '-') goto yy402;
+			if (yych <= '-') goto yy342;
 			if (yych <= '.') goto yy220;
 			goto yy172;
 		} else {
@@ -7765,30 +6861,30 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy218;
 		}
 	}
-yy436:
+yy376:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= '@') {
 			if (yych == ')') goto yy164;
 			goto yy3;
 		} else {
-			if (yych == 'L') goto yy443;
+			if (yych == 'L') goto yy383;
 			if (yych <= 'M') goto yy166;
-			goto yy442;
+			goto yy382;
 		}
 	} else {
 		if (yych <= 'l') {
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'k') goto yy166;
-			goto yy443;
+			goto yy383;
 		} else {
-			if (yych == 'n') goto yy442;
+			if (yych == 'n') goto yy382;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy437:
+yy377:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -7804,12 +6900,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'n') goto yy438;
+			if (yych <= 'n') goto yy378;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy438:
+yy378:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -7844,13 +6940,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'u') goto yy439;
+				if (yych <= 'u') goto yy379;
 				if (yych <= 'z') goto yy167;
 				goto yy218;
 			}
 		}
 	}
-yy439:
+yy379:
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy164;
@@ -7860,12 +6956,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'Z') goto yy168;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy440;
+			if (yych <= 'a') goto yy380;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy440:
+yy380:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -7881,22 +6977,22 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'r') goto yy441;
+			if (yych <= 'r') goto yy381;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy441:
+yy381:
 	yych = *++YYCURSOR;
 	if (yych <= 'X') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'Y') goto yy230;
-		if (yych == 'y') goto yy230;
+		if (yych <= 'Y') goto yy229;
+		if (yych == 'y') goto yy229;
 		goto yy3;
 	}
-yy442:
+yy382:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -7924,7 +7020,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '9') goto yy220;
 				goto yy218;
 			} else {
-				if (yych == 'E') goto yy444;
+				if (yych == 'E') goto yy384;
 				goto yy167;
 			}
 		} else {
@@ -7932,13 +7028,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'e') goto yy444;
+				if (yych <= 'e') goto yy384;
 				if (yych <= 'z') goto yy167;
 				goto yy218;
 			}
 		}
 	}
-yy443:
+yy383:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -7973,13 +7069,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'y') goto yy444;
+				if (yych <= 'y') goto yy384;
 				if (yych <= 'z') goto yy167;
 				goto yy218;
 			}
 		}
 	}
-yy444:
+yy384:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
@@ -8003,7 +7099,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy218;
 		}
 	}
-yy445:
+yy385:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -8020,14 +7116,14 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '/') goto yy172;
 				goto yy3;
 			} else {
-				if (yych == 'L') goto yy443;
+				if (yych == 'L') goto yy383;
 				goto yy166;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'N') goto yy442;
+				if (yych <= 'N') goto yy382;
 				goto yy166;
 			} else {
 				if (yych == '_') goto yy172;
@@ -8035,16 +7131,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		} else {
 			if (yych <= 'm') {
-				if (yych == 'l') goto yy452;
+				if (yych == 'l') goto yy392;
 				goto yy171;
 			} else {
-				if (yych <= 'n') goto yy451;
+				if (yych <= 'n') goto yy391;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy446:
+yy386:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -8059,7 +7155,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy438;
+			if (yych <= 'N') goto yy378;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -8068,13 +7164,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'n') goto yy447;
+				if (yych <= 'n') goto yy387;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy447:
+yy387:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -8090,7 +7186,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '-') {
 				if (yych <= ')') goto yy164;
 				if (yych <= ',') goto yy218;
-				goto yy396;
+				goto yy336;
 			} else {
 				if (yych == '/') goto yy172;
 				goto yy220;
@@ -8102,7 +7198,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'U') goto yy439;
+				if (yych <= 'U') goto yy379;
 				if (yych <= 'Z') goto yy167;
 				goto yy218;
 			}
@@ -8112,13 +7208,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy175;
 			} else {
-				if (yych <= 'u') goto yy448;
+				if (yych <= 'u') goto yy388;
 				if (yych <= 'z') goto yy175;
 				goto yy218;
 			}
 		}
 	}
-yy448:
+yy388:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -8132,18 +7228,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy440;
+			if (yych <= 'A') goto yy380;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy449;
+			if (yych <= 'a') goto yy389;
 			if (yych <= 'z') goto yy176;
 			goto yy3;
 		}
 	}
-yy449:
+yy389:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -8158,7 +7254,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy441;
+			if (yych <= 'R') goto yy381;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -8167,13 +7263,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'r') goto yy450;
+				if (yych <= 'r') goto yy390;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy450:
+yy390:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -8187,16 +7283,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'Y') goto yy230;
+			if (yych <= 'Y') goto yy229;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 'y') goto yy401;
+			if (yych == 'y') goto yy341;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy451:
+yy391:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -8212,7 +7308,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '-') {
 				if (yych <= ')') goto yy164;
 				if (yych <= ',') goto yy218;
-				goto yy396;
+				goto yy336;
 			} else {
 				if (yych == '/') goto yy172;
 				goto yy220;
@@ -8224,7 +7320,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'E') goto yy444;
+				if (yych <= 'E') goto yy384;
 				if (yych <= 'Z') goto yy167;
 				goto yy218;
 			}
@@ -8234,13 +7330,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy175;
 			} else {
-				if (yych <= 'e') goto yy453;
+				if (yych <= 'e') goto yy393;
 				if (yych <= 'z') goto yy175;
 				goto yy218;
 			}
 		}
 	}
-yy452:
+yy392:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -8256,7 +7352,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '-') {
 				if (yych <= ')') goto yy164;
 				if (yych <= ',') goto yy218;
-				goto yy396;
+				goto yy336;
 			} else {
 				if (yych == '/') goto yy172;
 				goto yy220;
@@ -8268,7 +7364,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'Y') goto yy444;
+				if (yych <= 'Y') goto yy384;
 				if (yych <= 'Z') goto yy167;
 				goto yy218;
 			}
@@ -8278,13 +7374,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy175;
 			} else {
-				if (yych <= 'y') goto yy453;
+				if (yych <= 'y') goto yy393;
 				if (yych <= 'z') goto yy175;
 				goto yy218;
 			}
 		}
 	}
-yy453:
+yy393:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -8298,7 +7394,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				goto yy164;
 			} else {
 				if (yych <= ',') goto yy218;
-				if (yych <= '-') goto yy402;
+				if (yych <= '-') goto yy342;
 				goto yy220;
 			}
 		}
@@ -8319,7 +7415,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy454:
+yy394:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -8348,7 +7444,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy455:
+yy395:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
@@ -8372,7 +7468,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy456:
+yy396:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -8452,7 +7548,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy459:
+yy399:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
@@ -8476,7 +7572,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy460:
+yy400:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -8497,7 +7593,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy166;
 		} else {
 			if (yych <= 'Z') {
-				if (yych <= 'I') goto yy455;
+				if (yych <= 'I') goto yy395;
 				goto yy166;
 			} else {
 				if (yych <= '`') goto yy3;
@@ -8506,7 +7602,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy461:
+yy401:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
@@ -8518,7 +7614,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			} else {
 				if (yych <= '9') {
 					if (yych <= '/') goto yy3;
-					goto yy481;
+					goto yy421;
 				} else {
 					if (yych <= ':') goto yy187;
 					if (yych <= 'C') goto yy3;
@@ -8579,7 +7675,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy462:
+yy402:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'V') {
@@ -8594,10 +7690,10 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				}
 			} else {
 				if (yych <= '5') {
-					if (yych <= '4') goto yy481;
-					goto yy466;
+					if (yych <= '4') goto yy421;
+					goto yy406;
 				} else {
-					if (yych <= '9') goto yy467;
+					if (yych <= '9') goto yy407;
 					if (yych <= ':') goto yy187;
 					goto yy3;
 				}
@@ -8662,7 +7758,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy463:
+yy403:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'V') {
@@ -8674,9 +7770,9 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			} else {
 				if (yych <= '5') {
 					if (yych <= '/') goto yy3;
-					goto yy466;
+					goto yy406;
 				} else {
-					if (yych <= '9') goto yy467;
+					if (yych <= '9') goto yy407;
 					if (yych <= ':') goto yy187;
 					goto yy3;
 				}
@@ -8741,7 +7837,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy464:
+yy404:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
@@ -8749,15 +7845,15 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		goto yy57;
 	}
 	if (yych <= ',') {
-		if (yych == '+') goto yy464;
+		if (yych == '+') goto yy404;
 		goto yy56;
 	} else {
-		if (yych <= '-') goto yy464;
+		if (yych <= '-') goto yy404;
 		if (yych <= '/') goto yy56;
 		if (yych <= '9') goto yy54;
 		goto yy56;
 	}
-yy466:
+yy406:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
@@ -8769,7 +7865,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			} else {
 				if (yych <= '9') {
 					if (yych <= '/') goto yy3;
-					goto yy480;
+					goto yy420;
 				} else {
 					if (yych == 'D') goto yy60;
 					goto yy3;
@@ -8825,7 +7921,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy467:
+yy407:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
@@ -8895,53 +7991,53 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
 	if (yych >= ':') goto yy60;
-yy469:
+yy409:
 	yych = *++YYCURSOR;
 	if (yybm[0+yych] & 2) {
 		goto yy54;
 	}
 	if (yych != '-') goto yy60;
-yy470:
+yy410:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy471;
-	if (yych <= '1') goto yy472;
+	if (yych <= '0') goto yy411;
+	if (yych <= '1') goto yy412;
 	goto yy56;
-yy471:
+yy411:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy473;
+	if (yych <= '9') goto yy413;
 	goto yy56;
-yy472:
+yy412:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '3') goto yy56;
-yy473:
+yy413:
 	yych = *++YYCURSOR;
 	if (yych != '-') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy475;
-	if (yych <= '2') goto yy476;
-	if (yych <= '3') goto yy477;
+	if (yych <= '0') goto yy415;
+	if (yych <= '2') goto yy416;
+	if (yych <= '3') goto yy417;
 	goto yy56;
-yy475:
+yy415:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy478;
+	if (yych <= '9') goto yy418;
 	goto yy56;
-yy476:
+yy416:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy478;
+	if (yych <= '9') goto yy418;
 	goto yy56;
-yy477:
+yy417:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '2') goto yy56;
-yy478:
+yy418:
 	++YYCURSOR;
-yy479:
+yy419:
 #line 1286 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash");
@@ -8953,8 +8049,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 8957 "ext/date/lib/parse_date.c"
-yy480:
+#line 8053 "ext/date/lib/parse_date.c"
+yy420:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
@@ -8966,7 +8062,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			} else {
 				if (yych <= '9') {
 					if (yych <= '/') goto yy3;
-					goto yy469;
+					goto yy409;
 				} else {
 					if (yych == 'D') goto yy60;
 					goto yy3;
@@ -9022,7 +8118,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy481:
+yy421:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'V') {
@@ -9035,7 +8131,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '5') {
 					if (yych <= '/') goto yy3;
 				} else {
-					if (yych <= '9') goto yy480;
+					if (yych <= '9') goto yy420;
 					if (yych <= ':') goto yy187;
 					goto yy3;
 				}
@@ -9180,7 +8276,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			} else {
 				if (yych <= '-') {
 					if (yych <= ',') goto yy3;
-					goto yy470;
+					goto yy410;
 				} else {
 					if (yych == 'D') goto yy60;
 					goto yy3;
@@ -9236,36 +8332,36 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy484:
+yy424:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy486;
-	if (yych <= '0') goto yy760;
-	if (yych <= '1') goto yy761;
-	if (yych <= '9') goto yy762;
-	goto yy486;
-yy485:
+	if (yych <= '/') goto yy426;
+	if (yych <= '0') goto yy700;
+	if (yych <= '1') goto yy701;
+	if (yych <= '9') goto yy702;
+	goto yy426;
+yy425:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 13) YYFILL(13);
 	yych = *YYCURSOR;
-yy486:
+yy426:
 	if (yych <= 'W') {
 		if (yych <= 'G') {
 			if (yych <= '.') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy485;
+					if (yych == '\t') goto yy425;
 					goto yy56;
 				} else {
-					if (yych <= ' ') goto yy485;
+					if (yych <= ' ') goto yy425;
 					if (yych <= ',') goto yy56;
-					goto yy601;
+					goto yy541;
 				}
 			} else {
 				if (yych <= 'C') {
-					if (yych == 'A') goto yy504;
+					if (yych == 'A') goto yy444;
 					goto yy56;
 				} else {
-					if (yych <= 'D') goto yy490;
-					if (yych == 'F') goto yy491;
+					if (yych <= 'D') goto yy430;
+					if (yych == 'F') goto yy431;
 					goto yy56;
 				}
 			}
@@ -9273,23 +8369,23 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'O') {
 				if (yych <= 'J') {
 					if (yych <= 'H') goto yy65;
-					if (yych <= 'I') goto yy499;
-					goto yy503;
+					if (yych <= 'I') goto yy439;
+					goto yy443;
 				} else {
 					if (yych <= 'L') goto yy56;
-					if (yych <= 'M') goto yy487;
-					if (yych <= 'N') goto yy506;
-					goto yy505;
+					if (yych <= 'M') goto yy427;
+					if (yych <= 'N') goto yy446;
+					goto yy445;
 				}
 			} else {
 				if (yych <= 'S') {
-					if (yych <= 'P') goto yy508;
+					if (yych <= 'P') goto yy448;
 					if (yych <= 'R') goto yy56;
-					goto yy488;
+					goto yy428;
 				} else {
 					if (yych <= 'T') goto yy70;
 					if (yych <= 'U') goto yy63;
-					if (yych <= 'V') goto yy501;
+					if (yych <= 'V') goto yy441;
 					goto yy69;
 				}
 			}
@@ -9298,33 +8394,33 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'm') {
 			if (yych <= 'e') {
 				if (yych <= '`') {
-					if (yych <= 'X') goto yy502;
+					if (yych <= 'X') goto yy442;
 					if (yych <= 'Y') goto yy68;
 					goto yy56;
 				} else {
-					if (yych <= 'a') goto yy504;
-					if (yych == 'd') goto yy490;
+					if (yych <= 'a') goto yy444;
+					if (yych == 'd') goto yy430;
 					goto yy56;
 				}
 			} else {
 				if (yych <= 'h') {
-					if (yych <= 'f') goto yy491;
+					if (yych <= 'f') goto yy431;
 					if (yych <= 'g') goto yy56;
 					goto yy65;
 				} else {
-					if (yych == 'j') goto yy503;
+					if (yych == 'j') goto yy443;
 					if (yych <= 'l') goto yy56;
 				}
 			}
 		} else {
 			if (yych <= 'u') {
 				if (yych <= 'p') {
-					if (yych <= 'n') goto yy506;
-					if (yych <= 'o') goto yy505;
-					goto yy508;
+					if (yych <= 'n') goto yy446;
+					if (yych <= 'o') goto yy445;
+					goto yy448;
 				} else {
 					if (yych <= 'r') goto yy56;
-					if (yych <= 's') goto yy488;
+					if (yych <= 's') goto yy428;
 					if (yych <= 't') goto yy70;
 					goto yy63;
 				}
@@ -9340,11 +8436,11 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy487:
+yy427:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= 'I') {
-			if (yych == 'A') goto yy616;
+			if (yych == 'A') goto yy556;
 			if (yych <= 'H') goto yy56;
 			goto yy138;
 		} else {
@@ -9354,7 +8450,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= 'i') {
-			if (yych == 'a') goto yy616;
+			if (yych == 'a') goto yy556;
 			if (yych <= 'h') goto yy56;
 			goto yy138;
 		} else {
@@ -9367,14 +8463,14 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy488:
+yy428:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych <= 'D') {
 			if (yych == 'A') goto yy119;
 			goto yy56;
 		} else {
-			if (yych <= 'E') goto yy1073;
+			if (yych <= 'E') goto yy1013;
 			if (yych <= 'T') goto yy56;
 			goto yy118;
 		}
@@ -9383,19 +8479,19 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych == 'a') goto yy119;
 			goto yy56;
 		} else {
-			if (yych <= 'e') goto yy1073;
+			if (yych <= 'e') goto yy1013;
 			if (yych == 'u') goto yy118;
 			goto yy56;
 		}
 	}
-yy489:
+yy429:
 	yych = *++YYCURSOR;
 	if (yych <= '`') {
 		if (yych <= 'D') {
 			if (yych == 'A') goto yy119;
 			goto yy56;
 		} else {
-			if (yych <= 'E') goto yy1073;
+			if (yych <= 'E') goto yy1013;
 			if (yych == 'U') goto yy118;
 			goto yy56;
 		}
@@ -9403,34 +8499,34 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'e') {
 			if (yych <= 'a') goto yy119;
 			if (yych <= 'd') goto yy56;
-			goto yy1073;
+			goto yy1013;
 		} else {
 			if (yych <= 's') goto yy56;
-			if (yych <= 't') goto yy753;
+			if (yych <= 't') goto yy693;
 			if (yych <= 'u') goto yy118;
 			goto yy56;
 		}
 	}
-yy490:
+yy430:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych == 'A') goto yy115;
 		if (yych <= 'D') goto yy56;
-		goto yy603;
+		goto yy543;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
 			goto yy115;
 		} else {
-			if (yych == 'e') goto yy603;
+			if (yych == 'e') goto yy543;
 			goto yy56;
 		}
 	}
-yy491:
+yy431:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= 'N') {
-			if (yych == 'E') goto yy619;
+			if (yych == 'E') goto yy559;
 			goto yy56;
 		} else {
 			if (yych <= 'O') goto yy100;
@@ -9439,7 +8535,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= 'n') {
-			if (yych == 'e') goto yy619;
+			if (yych == 'e') goto yy559;
 			goto yy56;
 		} else {
 			if (yych <= 'o') goto yy100;
@@ -9447,7 +8543,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy56;
 		}
 	}
-yy492:
+yy432:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych == 'H') goto yy71;
@@ -9456,68 +8552,68 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	} else {
 		if (yych <= 'h') {
 			if (yych <= 'g') goto yy56;
-			goto yy1072;
+			goto yy1012;
 		} else {
 			if (yych == 'u') goto yy72;
 			goto yy56;
 		}
 	}
-yy493:
+yy433:
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy766;
+	if (yych == '-') goto yy706;
 	if (yych <= '/') goto yy60;
-	if (yych <= '9') goto yy765;
+	if (yych <= '9') goto yy705;
 	goto yy60;
-yy494:
+yy434:
 	yych = *++YYCURSOR;
 	if (yych <= 'c') {
-		if (yych == 'O') goto yy554;
+		if (yych == 'O') goto yy494;
 		goto yy56;
 	} else {
-		if (yych <= 'd') goto yy753;
-		if (yych == 'o') goto yy554;
+		if (yych <= 'd') goto yy693;
+		if (yych == 'o') goto yy494;
 		goto yy56;
 	}
-yy495:
+yy435:
 	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy753;
+	if (yych == 'd') goto yy693;
 	goto yy56;
-yy496:
+yy436:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
 	case '1':
-	case '2':	goto yy690;
-	case '3':	goto yy692;
+	case '2':	goto yy630;
+	case '3':	goto yy632;
 	case '4':
 	case '5':
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy693;
+	case '9':	goto yy633;
 	case 'A':
-	case 'a':	goto yy697;
+	case 'a':	goto yy637;
 	case 'D':
-	case 'd':	goto yy701;
+	case 'd':	goto yy641;
 	case 'F':
-	case 'f':	goto yy695;
+	case 'f':	goto yy635;
 	case 'J':
-	case 'j':	goto yy694;
+	case 'j':	goto yy634;
 	case 'M':
-	case 'm':	goto yy696;
+	case 'm':	goto yy636;
 	case 'N':
-	case 'n':	goto yy700;
+	case 'n':	goto yy640;
 	case 'O':
-	case 'o':	goto yy699;
+	case 'o':	goto yy639;
 	case 'S':
-	case 's':	goto yy698;
+	case 's':	goto yy638;
 	default:	goto yy56;
 	}
-yy497:
+yy437:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '0':	goto yy640;
-	case '1':	goto yy641;
+	case '0':	goto yy580;
+	case '1':	goto yy581;
 	case '2':
 	case '3':
 	case '4':
@@ -9525,57 +8621,57 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy642;
+	case '9':	goto yy582;
 	case 'A':
-	case 'a':	goto yy646;
+	case 'a':	goto yy586;
 	case 'D':
-	case 'd':	goto yy650;
+	case 'd':	goto yy590;
 	case 'F':
-	case 'f':	goto yy644;
+	case 'f':	goto yy584;
 	case 'J':
-	case 'j':	goto yy643;
+	case 'j':	goto yy583;
 	case 'M':
-	case 'm':	goto yy645;
+	case 'm':	goto yy585;
 	case 'N':
-	case 'n':	goto yy649;
+	case 'n':	goto yy589;
 	case 'O':
-	case 'o':	goto yy648;
+	case 'o':	goto yy588;
 	case 'S':
-	case 's':	goto yy647;
-	default:	goto yy602;
+	case 's':	goto yy587;
+	default:	goto yy542;
 	}
-yy498:
+yy438:
 	yych = *++YYCURSOR;
 	if (yych <= '1') {
-		if (yych <= '/') goto yy602;
-		if (yych <= '0') goto yy592;
-		goto yy593;
+		if (yych <= '/') goto yy542;
+		if (yych <= '0') goto yy532;
+		goto yy533;
 	} else {
-		if (yych <= '5') goto yy594;
-		if (yych <= '9') goto yy595;
-		goto yy602;
+		if (yych <= '5') goto yy534;
+		if (yych <= '9') goto yy535;
+		goto yy542;
 	}
-yy499:
-	yyaccept = 10;
+yy439:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
+			if (yych == '\t') goto yy496;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych <= '.') goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych <= '.') goto yy496;
 		}
 	} else {
 		if (yych <= 'U') {
-			if (yych <= '9') goto yy558;
-			if (yych == 'I') goto yy591;
+			if (yych <= '9') goto yy498;
+			if (yych == 'I') goto yy531;
 		} else {
-			if (yych == 'W') goto yy500;
-			if (yych <= 'X') goto yy564;
+			if (yych == 'W') goto yy440;
+			if (yych <= 'X') goto yy504;
 		}
 	}
-yy500:
+yy440:
 #line 1423 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenoyearrev");
@@ -9587,133 +8683,133 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 9591 "ext/date/lib/parse_date.c"
-yy501:
-	yyaccept = 10;
+#line 8687 "ext/date/lib/parse_date.c"
+yy441:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
 		if (yych <= '\t') {
-			if (yych <= 0x08) goto yy500;
-			goto yy556;
+			if (yych <= 0x08) goto yy440;
+			goto yy496;
 		} else {
-			if (yych == ' ') goto yy556;
-			goto yy500;
+			if (yych == ' ') goto yy496;
+			goto yy440;
 		}
 	} else {
 		if (yych <= '9') {
-			if (yych <= '.') goto yy556;
-			if (yych <= '/') goto yy500;
-			goto yy558;
+			if (yych <= '.') goto yy496;
+			if (yych <= '/') goto yy440;
+			goto yy498;
 		} else {
-			if (yych == 'I') goto yy589;
-			goto yy500;
+			if (yych == 'I') goto yy529;
+			goto yy440;
 		}
 	}
-yy502:
-	yyaccept = 10;
+yy442:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
 		if (yych <= '\t') {
-			if (yych <= 0x08) goto yy500;
-			goto yy556;
+			if (yych <= 0x08) goto yy440;
+			goto yy496;
 		} else {
-			if (yych == ' ') goto yy556;
-			goto yy500;
+			if (yych == ' ') goto yy496;
+			goto yy440;
 		}
 	} else {
 		if (yych <= '9') {
-			if (yych <= '.') goto yy556;
-			if (yych <= '/') goto yy500;
-			goto yy558;
+			if (yych <= '.') goto yy496;
+			if (yych <= '/') goto yy440;
+			goto yy498;
 		} else {
-			if (yych == 'I') goto yy588;
-			goto yy500;
+			if (yych == 'I') goto yy528;
+			goto yy440;
 		}
 	}
-yy503:
+yy443:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'A') goto yy581;
+		if (yych == 'A') goto yy521;
 		if (yych <= 'T') goto yy56;
-		goto yy580;
+		goto yy520;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
-			goto yy581;
+			goto yy521;
 		} else {
-			if (yych == 'u') goto yy580;
+			if (yych == 'u') goto yy520;
 			goto yy56;
 		}
 	}
-yy504:
+yy444:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= 'L') {
-			if (yych == '.') goto yy509;
+			if (yych == '.') goto yy449;
 			goto yy56;
 		} else {
-			if (yych <= 'M') goto yy510;
-			if (yych == 'P') goto yy574;
+			if (yych <= 'M') goto yy450;
+			if (yych == 'P') goto yy514;
 			goto yy56;
 		}
 	} else {
 		if (yych <= 'o') {
-			if (yych <= 'U') goto yy573;
-			if (yych == 'm') goto yy510;
+			if (yych <= 'U') goto yy513;
+			if (yych == 'm') goto yy450;
 			goto yy56;
 		} else {
-			if (yych <= 'p') goto yy574;
-			if (yych == 'u') goto yy573;
+			if (yych <= 'p') goto yy514;
+			if (yych == 'u') goto yy513;
 			goto yy56;
 		}
 	}
-yy505:
+yy445:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy568;
-	if (yych == 'c') goto yy568;
+	if (yych == 'C') goto yy508;
+	if (yych == 'c') goto yy508;
 	goto yy56;
-yy506:
+yy446:
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy554;
-	if (yych == 'o') goto yy554;
+	if (yych == 'O') goto yy494;
+	if (yych == 'o') goto yy494;
 	goto yy56;
-yy507:
+yy447:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy514;
-	if (yych <= '9') goto yy516;
+	if (yych <= '5') goto yy454;
+	if (yych <= '9') goto yy456;
 	goto yy56;
-yy508:
+yy448:
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
 		if (yych != '.') goto yy56;
 	} else {
-		if (yych <= 'M') goto yy510;
-		if (yych == 'm') goto yy510;
+		if (yych <= 'M') goto yy450;
+		if (yych == 'm') goto yy450;
 		goto yy56;
 	}
-yy509:
+yy449:
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy510;
+	if (yych == 'M') goto yy450;
 	if (yych != 'm') goto yy56;
-yy510:
+yy450:
 	yych = *++YYCURSOR;
 	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy512;
-		if (yych == '\t') goto yy512;
+		if (yych <= 0x00) goto yy452;
+		if (yych == '\t') goto yy452;
 		goto yy56;
 	} else {
-		if (yych <= ' ') goto yy512;
+		if (yych <= ' ') goto yy452;
 		if (yych != '.') goto yy56;
 	}
 	yych = *++YYCURSOR;
 	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy512;
+		if (yych <= 0x00) goto yy452;
 		if (yych <= 0x08) goto yy56;
 	} else {
 		if (yych != ' ') goto yy56;
 	}
-yy512:
+yy452:
 	++YYCURSOR;
 #line 1141 "ext/date/lib/parse_date.re"
 	{
@@ -9731,17 +8827,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME12;
 	}
-#line 9735 "ext/date/lib/parse_date.c"
-yy514:
-	yyaccept = 11;
+#line 8831 "ext/date/lib/parse_date.c"
+yy454:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy517;
+		if (yych == '.') goto yy457;
 	} else {
-		if (yych <= '9') goto yy531;
-		if (yych <= ':') goto yy517;
+		if (yych <= '9') goto yy471;
+		if (yych <= ':') goto yy457;
 	}
-yy515:
+yy455:
 #line 1178 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
@@ -9767,282 +8863,282 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 9771 "ext/date/lib/parse_date.c"
-yy516:
-	yyaccept = 11;
+#line 8867 "ext/date/lib/parse_date.c"
+yy456:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy517;
-	if (yych != ':') goto yy515;
-yy517:
+	if (yych == '.') goto yy457;
+	if (yych != ':') goto yy455;
+yy457:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy518;
-	if (yych <= '6') goto yy519;
-	if (yych <= '9') goto yy520;
+	if (yych <= '5') goto yy458;
+	if (yych <= '6') goto yy459;
+	if (yych <= '9') goto yy460;
 	goto yy56;
-yy518:
-	yyaccept = 11;
+yy458:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy521;
-	if (yych <= '/') goto yy515;
-	if (yych <= '9') goto yy524;
-	goto yy515;
-yy519:
-	yyaccept = 11;
+	if (yych == '.') goto yy461;
+	if (yych <= '/') goto yy455;
+	if (yych <= '9') goto yy464;
+	goto yy455;
+yy459:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy521;
-	if (yych == '0') goto yy524;
-	goto yy515;
-yy520:
-	yyaccept = 11;
+	if (yych == '.') goto yy461;
+	if (yych == '0') goto yy464;
+	goto yy455;
+yy460:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych != '.') goto yy515;
-yy521:
+	if (yych != '.') goto yy455;
+yy461:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
-yy522:
+yy462:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy515;
-	if (yych <= '9') goto yy522;
-	goto yy515;
-yy524:
-	yyaccept = 11;
+	if (yych <= '/') goto yy455;
+	if (yych <= '9') goto yy462;
+	goto yy455;
+yy464:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
 		if (yych <= 0x1F) {
-			if (yych != '\t') goto yy515;
+			if (yych != '\t') goto yy455;
 		} else {
-			if (yych <= ' ') goto yy525;
-			if (yych == '.') goto yy521;
-			goto yy515;
+			if (yych <= ' ') goto yy465;
+			if (yych == '.') goto yy461;
+			goto yy455;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'A') goto yy527;
-			if (yych == 'P') goto yy527;
-			goto yy515;
+			if (yych <= 'A') goto yy467;
+			if (yych == 'P') goto yy467;
+			goto yy455;
 		} else {
-			if (yych <= 'a') goto yy527;
-			if (yych == 'p') goto yy527;
-			goto yy515;
+			if (yych <= 'a') goto yy467;
+			if (yych == 'p') goto yy467;
+			goto yy455;
 		}
 	}
-yy525:
+yy465:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
 	yych = *YYCURSOR;
 	if (yych <= 'A') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy525;
+			if (yych == '\t') goto yy465;
 			goto yy56;
 		} else {
-			if (yych <= ' ') goto yy525;
+			if (yych <= ' ') goto yy465;
 			if (yych <= '@') goto yy56;
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych != 'P') goto yy56;
 		} else {
-			if (yych <= 'a') goto yy527;
+			if (yych <= 'a') goto yy467;
 			if (yych != 'p') goto yy56;
 		}
 	}
-yy527:
+yy467:
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
 		if (yych != '.') goto yy56;
 	} else {
-		if (yych <= 'M') goto yy529;
-		if (yych == 'm') goto yy529;
+		if (yych <= 'M') goto yy469;
+		if (yych == 'm') goto yy469;
 		goto yy56;
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy529;
+	if (yych == 'M') goto yy469;
 	if (yych != 'm') goto yy56;
-yy529:
+yy469:
 	yych = *++YYCURSOR;
 	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy512;
-		if (yych == '\t') goto yy512;
+		if (yych <= 0x00) goto yy452;
+		if (yych == '\t') goto yy452;
 		goto yy56;
 	} else {
-		if (yych <= ' ') goto yy512;
+		if (yych <= ' ') goto yy452;
 		if (yych != '.') goto yy56;
 	}
 	yych = *++YYCURSOR;
 	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy512;
+		if (yych <= 0x00) goto yy452;
 		if (yych <= 0x08) goto yy56;
-		goto yy512;
+		goto yy452;
 	} else {
-		if (yych == ' ') goto yy512;
+		if (yych == ' ') goto yy452;
 		goto yy56;
 	}
-yy531:
-	yyaccept = 11;
+yy471:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ':') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy532;
-			if (yych <= 0x1F) goto yy515;
+			if (yych == '\t') goto yy472;
+			if (yych <= 0x1F) goto yy455;
 		} else {
-			if (yych == '.') goto yy517;
-			if (yych <= '9') goto yy515;
-			goto yy535;
+			if (yych == '.') goto yy457;
+			if (yych <= '9') goto yy455;
+			goto yy475;
 		}
 	} else {
 		if (yych <= 'P') {
-			if (yych == 'A') goto yy534;
-			if (yych <= 'O') goto yy515;
-			goto yy534;
+			if (yych == 'A') goto yy474;
+			if (yych <= 'O') goto yy455;
+			goto yy474;
 		} else {
 			if (yych <= 'a') {
-				if (yych <= '`') goto yy515;
-				goto yy534;
+				if (yych <= '`') goto yy455;
+				goto yy474;
 			} else {
-				if (yych == 'p') goto yy534;
-				goto yy515;
+				if (yych == 'p') goto yy474;
+				goto yy455;
 			}
 		}
 	}
-yy532:
+yy472:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
 	yych = *YYCURSOR;
 	if (yych <= 'A') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy532;
+			if (yych == '\t') goto yy472;
 			goto yy56;
 		} else {
-			if (yych <= ' ') goto yy532;
+			if (yych <= ' ') goto yy472;
 			if (yych <= '@') goto yy56;
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych != 'P') goto yy56;
 		} else {
-			if (yych <= 'a') goto yy534;
+			if (yych <= 'a') goto yy474;
 			if (yych != 'p') goto yy56;
 		}
 	}
-yy534:
+yy474:
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
-		if (yych == '.') goto yy551;
+		if (yych == '.') goto yy491;
 		goto yy56;
 	} else {
-		if (yych <= 'M') goto yy552;
-		if (yych == 'm') goto yy552;
+		if (yych <= 'M') goto yy492;
+		if (yych == 'm') goto yy492;
 		goto yy56;
 	}
-yy535:
+yy475:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy536;
-	if (yych <= '6') goto yy537;
-	if (yych <= '9') goto yy520;
+	if (yych <= '5') goto yy476;
+	if (yych <= '6') goto yy477;
+	if (yych <= '9') goto yy460;
 	goto yy56;
-yy536:
-	yyaccept = 11;
+yy476:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy521;
-	if (yych <= '/') goto yy515;
-	if (yych <= '9') goto yy538;
-	goto yy515;
-yy537:
-	yyaccept = 11;
+	if (yych == '.') goto yy461;
+	if (yych <= '/') goto yy455;
+	if (yych <= '9') goto yy478;
+	goto yy455;
+yy477:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy521;
-	if (yych != '0') goto yy515;
-yy538:
-	yyaccept = 11;
+	if (yych == '.') goto yy461;
+	if (yych != '0') goto yy455;
+yy478:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ':') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy525;
-			if (yych <= 0x1F) goto yy515;
-			goto yy525;
+			if (yych == '\t') goto yy465;
+			if (yych <= 0x1F) goto yy455;
+			goto yy465;
 		} else {
-			if (yych == '.') goto yy539;
-			if (yych <= '9') goto yy515;
-			goto yy540;
+			if (yych == '.') goto yy479;
+			if (yych <= '9') goto yy455;
+			goto yy480;
 		}
 	} else {
 		if (yych <= 'P') {
-			if (yych == 'A') goto yy527;
-			if (yych <= 'O') goto yy515;
-			goto yy527;
+			if (yych == 'A') goto yy467;
+			if (yych <= 'O') goto yy455;
+			goto yy467;
 		} else {
 			if (yych <= 'a') {
-				if (yych <= '`') goto yy515;
-				goto yy527;
+				if (yych <= '`') goto yy455;
+				goto yy467;
 			} else {
-				if (yych == 'p') goto yy527;
-				goto yy515;
+				if (yych == 'p') goto yy467;
+				goto yy455;
 			}
 		}
 	}
-yy539:
+yy479:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy549;
+	if (yych <= '9') goto yy489;
 	goto yy56;
-yy540:
+yy480:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
-yy541:
+yy481:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
 	yych = *YYCURSOR;
 	if (yych <= 'O') {
 		if (yych <= '9') {
 			if (yych <= '/') goto yy56;
-			goto yy541;
+			goto yy481;
 		} else {
 			if (yych != 'A') goto yy56;
 		}
 	} else {
 		if (yych <= 'a') {
-			if (yych <= 'P') goto yy543;
+			if (yych <= 'P') goto yy483;
 			if (yych <= '`') goto yy56;
 		} else {
 			if (yych != 'p') goto yy56;
 		}
 	}
-yy543:
+yy483:
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
 		if (yych != '.') goto yy56;
 	} else {
-		if (yych <= 'M') goto yy545;
-		if (yych == 'm') goto yy545;
+		if (yych <= 'M') goto yy485;
+		if (yych == 'm') goto yy485;
 		goto yy56;
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy545;
+	if (yych == 'M') goto yy485;
 	if (yych != 'm') goto yy56;
-yy545:
+yy485:
 	yych = *++YYCURSOR;
 	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy547;
-		if (yych == '\t') goto yy547;
+		if (yych <= 0x00) goto yy487;
+		if (yych == '\t') goto yy487;
 		goto yy56;
 	} else {
-		if (yych <= ' ') goto yy547;
+		if (yych <= ' ') goto yy487;
 		if (yych != '.') goto yy56;
 	}
 	yych = *++YYCURSOR;
 	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy547;
+		if (yych <= 0x00) goto yy487;
 		if (yych <= 0x08) goto yy56;
 	} else {
 		if (yych != ' ') goto yy56;
 	}
-yy547:
+yy487:
 	++YYCURSOR;
 #line 1158 "ext/date/lib/parse_date.re"
 	{
@@ -10063,101 +9159,101 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 10067 "ext/date/lib/parse_date.c"
-yy549:
-	yyaccept = 11;
+#line 9163 "ext/date/lib/parse_date.c"
+yy489:
+	yyaccept = 10;
 	YYMARKER = ++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
 	yych = *YYCURSOR;
 	if (yych <= 'O') {
 		if (yych <= '9') {
-			if (yych <= '/') goto yy515;
-			goto yy549;
+			if (yych <= '/') goto yy455;
+			goto yy489;
 		} else {
-			if (yych == 'A') goto yy543;
-			goto yy515;
+			if (yych == 'A') goto yy483;
+			goto yy455;
 		}
 	} else {
 		if (yych <= 'a') {
-			if (yych <= 'P') goto yy543;
-			if (yych <= '`') goto yy515;
-			goto yy543;
+			if (yych <= 'P') goto yy483;
+			if (yych <= '`') goto yy455;
+			goto yy483;
 		} else {
-			if (yych == 'p') goto yy543;
-			goto yy515;
+			if (yych == 'p') goto yy483;
+			goto yy455;
 		}
 	}
-yy551:
+yy491:
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy552;
+	if (yych == 'M') goto yy492;
 	if (yych != 'm') goto yy56;
-yy552:
+yy492:
 	yych = *++YYCURSOR;
 	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy512;
-		if (yych == '\t') goto yy512;
+		if (yych <= 0x00) goto yy452;
+		if (yych == '\t') goto yy452;
 		goto yy56;
 	} else {
-		if (yych <= ' ') goto yy512;
+		if (yych <= ' ') goto yy452;
 		if (yych != '.') goto yy56;
 	}
 	yych = *++YYCURSOR;
 	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy512;
+		if (yych <= 0x00) goto yy452;
 		if (yych <= 0x08) goto yy56;
-		goto yy512;
+		goto yy452;
 	} else {
-		if (yych == ' ') goto yy512;
+		if (yych == ' ') goto yy452;
 		goto yy56;
 	}
-yy554:
+yy494:
 	yych = *++YYCURSOR;
-	if (yych == 'V') goto yy555;
+	if (yych == 'V') goto yy495;
 	if (yych != 'v') goto yy56;
-yy555:
-	yyaccept = 10;
+yy495:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych != '\t') goto yy500;
+			if (yych != '\t') goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
 		}
 	} else {
 		if (yych <= 'D') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'E') goto yy560;
-			if (yych == 'e') goto yy560;
-			goto yy500;
+			if (yych <= 'E') goto yy500;
+			if (yych == 'e') goto yy500;
+			goto yy440;
 		}
 	}
-yy556:
+yy496:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-yy557:
+yy497:
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy556;
+		if (yych == '\t') goto yy496;
 		if (yych <= 0x1F) goto yy56;
-		goto yy556;
+		goto yy496;
 	} else {
 		if (yych <= '.') {
 			if (yych <= ',') goto yy56;
-			goto yy556;
+			goto yy496;
 		} else {
 			if (yych <= '/') goto yy56;
 			if (yych >= ':') goto yy56;
 		}
 	}
-yy558:
+yy498:
 	++YYCURSOR;
-	if ((yych = *YYCURSOR) <= '/') goto yy559;
-	if (yych <= '9') goto yy565;
-yy559:
+	if ((yych = *YYCURSOR) <= '/') goto yy499;
+	if (yych <= '9') goto yy505;
+yy499:
 #line 1340 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
@@ -10172,666 +9268,666 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL;
 	}
-#line 10176 "ext/date/lib/parse_date.c"
-yy560:
+#line 9272 "ext/date/lib/parse_date.c"
+yy500:
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy561;
+	if (yych == 'M') goto yy501;
 	if (yych != 'm') goto yy56;
-yy561:
+yy501:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy562;
+	if (yych == 'B') goto yy502;
 	if (yych != 'b') goto yy56;
-yy562:
+yy502:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy563;
+	if (yych == 'E') goto yy503;
 	if (yych != 'e') goto yy56;
-yy563:
+yy503:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy564;
+	if (yych == 'R') goto yy504;
 	if (yych != 'r') goto yy56;
-yy564:
-	yyaccept = 10;
+yy504:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy556;
-		if (yych <= 0x1F) goto yy500;
-		goto yy556;
+		if (yych == '\t') goto yy496;
+		if (yych <= 0x1F) goto yy440;
+		goto yy496;
 	} else {
 		if (yych <= '.') {
-			if (yych <= ',') goto yy500;
-			goto yy556;
+			if (yych <= ',') goto yy440;
+			goto yy496;
 		} else {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		}
 	}
-yy565:
+yy505:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy559;
-	if (yych >= ':') goto yy559;
-yy566:
+	if (yych <= '/') goto yy499;
+	if (yych >= ':') goto yy499;
+yy506:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy559;
-	if (yych >= ':') goto yy559;
+	if (yych <= '/') goto yy499;
+	if (yych >= ':') goto yy499;
 	yych = *++YYCURSOR;
-	goto yy559;
-yy568:
+	goto yy499;
+yy508:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy569;
+	if (yych == 'T') goto yy509;
 	if (yych != 't') goto yy56;
-yy569:
-	yyaccept = 10;
+yy509:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'N') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'O') goto yy570;
-			if (yych != 'o') goto yy500;
+			if (yych <= 'O') goto yy510;
+			if (yych != 'o') goto yy440;
 		}
 	}
-yy570:
+yy510:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy571;
+	if (yych == 'B') goto yy511;
 	if (yych != 'b') goto yy56;
-yy571:
+yy511:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy572;
+	if (yych == 'E') goto yy512;
 	if (yych != 'e') goto yy56;
-yy572:
+yy512:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy564;
-	if (yych == 'r') goto yy564;
+	if (yych == 'R') goto yy504;
+	if (yych == 'r') goto yy504;
 	goto yy56;
-yy573:
+yy513:
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy577;
-	if (yych == 'g') goto yy577;
+	if (yych == 'G') goto yy517;
+	if (yych == 'g') goto yy517;
 	goto yy56;
-yy574:
+yy514:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy575;
+	if (yych == 'R') goto yy515;
 	if (yych != 'r') goto yy56;
-yy575:
-	yyaccept = 10;
+yy515:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'H') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'I') goto yy576;
-			if (yych != 'i') goto yy500;
+			if (yych <= 'I') goto yy516;
+			if (yych != 'i') goto yy440;
 		}
 	}
-yy576:
+yy516:
 	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy564;
-	if (yych == 'l') goto yy564;
+	if (yych == 'L') goto yy504;
+	if (yych == 'l') goto yy504;
 	goto yy56;
-yy577:
-	yyaccept = 10;
+yy517:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'T') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'U') goto yy578;
-			if (yych != 'u') goto yy500;
+			if (yych <= 'U') goto yy518;
+			if (yych != 'u') goto yy440;
 		}
 	}
-yy578:
+yy518:
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy579;
+	if (yych == 'S') goto yy519;
 	if (yych != 's') goto yy56;
-yy579:
+yy519:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy564;
-	if (yych == 't') goto yy564;
+	if (yych == 'T') goto yy504;
+	if (yych == 't') goto yy504;
 	goto yy56;
-yy580:
+yy520:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'L') goto yy587;
+		if (yych == 'L') goto yy527;
 		if (yych <= 'M') goto yy56;
-		goto yy586;
+		goto yy526;
 	} else {
 		if (yych <= 'l') {
 			if (yych <= 'k') goto yy56;
-			goto yy587;
+			goto yy527;
 		} else {
-			if (yych == 'n') goto yy586;
+			if (yych == 'n') goto yy526;
 			goto yy56;
 		}
 	}
-yy581:
+yy521:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy582;
+	if (yych == 'N') goto yy522;
 	if (yych != 'n') goto yy56;
-yy582:
-	yyaccept = 10;
+yy522:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'T') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'U') goto yy583;
-			if (yych != 'u') goto yy500;
+			if (yych <= 'U') goto yy523;
+			if (yych != 'u') goto yy440;
 		}
 	}
-yy583:
+yy523:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy584;
+	if (yych == 'A') goto yy524;
 	if (yych != 'a') goto yy56;
-yy584:
+yy524:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy585;
+	if (yych == 'R') goto yy525;
 	if (yych != 'r') goto yy56;
-yy585:
+yy525:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy564;
-	if (yych == 'y') goto yy564;
+	if (yych == 'Y') goto yy504;
+	if (yych == 'y') goto yy504;
 	goto yy56;
-yy586:
-	yyaccept = 10;
+yy526:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'D') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'E') goto yy564;
-			if (yych == 'e') goto yy564;
-			goto yy500;
+			if (yych <= 'E') goto yy504;
+			if (yych == 'e') goto yy504;
+			goto yy440;
 		}
 	}
-yy587:
-	yyaccept = 10;
+yy527:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'X') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'Y') goto yy564;
-			if (yych == 'y') goto yy564;
-			goto yy500;
+			if (yych <= 'Y') goto yy504;
+			if (yych == 'y') goto yy504;
+			goto yy440;
 		}
 	}
-yy588:
-	yyaccept = 10;
+yy528:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
 		if (yych <= '\t') {
-			if (yych <= 0x08) goto yy500;
-			goto yy556;
+			if (yych <= 0x08) goto yy440;
+			goto yy496;
 		} else {
-			if (yych == ' ') goto yy556;
-			goto yy500;
+			if (yych == ' ') goto yy496;
+			goto yy440;
 		}
 	} else {
 		if (yych <= '9') {
-			if (yych <= '.') goto yy556;
-			if (yych <= '/') goto yy500;
-			goto yy558;
+			if (yych <= '.') goto yy496;
+			if (yych <= '/') goto yy440;
+			goto yy498;
 		} else {
-			if (yych == 'I') goto yy564;
-			goto yy500;
+			if (yych == 'I') goto yy504;
+			goto yy440;
 		}
 	}
-yy589:
-	yyaccept = 10;
+yy529:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
 		if (yych <= '\t') {
-			if (yych <= 0x08) goto yy500;
-			goto yy556;
+			if (yych <= 0x08) goto yy440;
+			goto yy496;
 		} else {
-			if (yych == ' ') goto yy556;
-			goto yy500;
+			if (yych == ' ') goto yy496;
+			goto yy440;
 		}
 	} else {
 		if (yych <= '9') {
-			if (yych <= '.') goto yy556;
-			if (yych <= '/') goto yy500;
-			goto yy558;
+			if (yych <= '.') goto yy496;
+			if (yych <= '/') goto yy440;
+			goto yy498;
 		} else {
-			if (yych != 'I') goto yy500;
+			if (yych != 'I') goto yy440;
 		}
 	}
-	yyaccept = 10;
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
 		if (yych <= '\t') {
-			if (yych <= 0x08) goto yy500;
-			goto yy556;
+			if (yych <= 0x08) goto yy440;
+			goto yy496;
 		} else {
-			if (yych == ' ') goto yy556;
-			goto yy500;
+			if (yych == ' ') goto yy496;
+			goto yy440;
 		}
 	} else {
 		if (yych <= '9') {
-			if (yych <= '.') goto yy556;
-			if (yych <= '/') goto yy500;
-			goto yy558;
+			if (yych <= '.') goto yy496;
+			if (yych <= '/') goto yy440;
+			goto yy498;
 		} else {
-			if (yych == 'I') goto yy564;
-			goto yy500;
+			if (yych == 'I') goto yy504;
+			goto yy440;
 		}
 	}
-yy591:
-	yyaccept = 10;
+yy531:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
 		if (yych <= '\t') {
-			if (yych <= 0x08) goto yy500;
-			goto yy556;
+			if (yych <= 0x08) goto yy440;
+			goto yy496;
 		} else {
-			if (yych == ' ') goto yy556;
-			goto yy500;
+			if (yych == ' ') goto yy496;
+			goto yy440;
 		}
 	} else {
 		if (yych <= '9') {
-			if (yych <= '.') goto yy556;
-			if (yych <= '/') goto yy500;
-			goto yy558;
+			if (yych <= '.') goto yy496;
+			if (yych <= '/') goto yy440;
+			goto yy498;
 		} else {
-			if (yych == 'I') goto yy564;
-			goto yy500;
+			if (yych == 'I') goto yy504;
+			goto yy440;
 		}
 	}
-yy592:
-	yyaccept = 11;
+yy532:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
-		if (yych <= ',') goto yy515;
-		if (yych <= '-') goto yy626;
-		goto yy625;
+		if (yych <= ',') goto yy455;
+		if (yych <= '-') goto yy566;
+		goto yy565;
 	} else {
-		if (yych <= '/') goto yy515;
-		if (yych <= '9') goto yy639;
-		if (yych <= ':') goto yy517;
-		goto yy515;
+		if (yych <= '/') goto yy455;
+		if (yych <= '9') goto yy579;
+		if (yych <= ':') goto yy457;
+		goto yy455;
 	}
-yy593:
-	yyaccept = 11;
+yy533:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych <= ',') goto yy515;
-		if (yych <= '-') goto yy626;
-		if (yych <= '.') goto yy625;
-		goto yy515;
+		if (yych <= ',') goto yy455;
+		if (yych <= '-') goto yy566;
+		if (yych <= '.') goto yy565;
+		goto yy455;
 	} else {
-		if (yych <= '2') goto yy639;
-		if (yych <= '9') goto yy638;
-		if (yych <= ':') goto yy517;
-		goto yy515;
+		if (yych <= '2') goto yy579;
+		if (yych <= '9') goto yy578;
+		if (yych <= ':') goto yy457;
+		goto yy455;
 	}
-yy594:
-	yyaccept = 11;
+yy534:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
-		if (yych <= ',') goto yy515;
-		if (yych <= '-') goto yy626;
-		goto yy625;
+		if (yych <= ',') goto yy455;
+		if (yych <= '-') goto yy566;
+		goto yy565;
 	} else {
-		if (yych <= '/') goto yy515;
-		if (yych <= '9') goto yy638;
-		if (yych <= ':') goto yy517;
-		goto yy515;
+		if (yych <= '/') goto yy455;
+		if (yych <= '9') goto yy578;
+		if (yych <= ':') goto yy457;
+		goto yy455;
 	}
-yy595:
-	yyaccept = 11;
+yy535:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
-		if (yych <= ',') goto yy515;
-		if (yych <= '-') goto yy626;
-		goto yy625;
+		if (yych <= ',') goto yy455;
+		if (yych <= '-') goto yy566;
+		goto yy565;
 	} else {
-		if (yych == ':') goto yy517;
-		goto yy515;
+		if (yych == ':') goto yy457;
+		goto yy455;
 	}
-yy596:
+yy536:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy619;
-	if (yych == 'e') goto yy619;
+	if (yych == 'E') goto yy559;
+	if (yych == 'e') goto yy559;
 	goto yy56;
-yy597:
+yy537:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy616;
-	if (yych == 'a') goto yy616;
+	if (yych == 'A') goto yy556;
+	if (yych == 'a') goto yy556;
 	goto yy56;
-yy598:
+yy538:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'P') goto yy574;
+		if (yych == 'P') goto yy514;
 		if (yych <= 'T') goto yy56;
-		goto yy573;
+		goto yy513;
 	} else {
 		if (yych <= 'p') {
 			if (yych <= 'o') goto yy56;
-			goto yy574;
+			goto yy514;
 		} else {
-			if (yych == 'u') goto yy573;
+			if (yych == 'u') goto yy513;
 			goto yy56;
 		}
 	}
-yy599:
+yy539:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy609;
-	if (yych == 'e') goto yy609;
+	if (yych == 'E') goto yy549;
+	if (yych == 'e') goto yy549;
 	goto yy56;
-yy600:
+yy540:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy603;
-	if (yych == 'e') goto yy603;
+	if (yych == 'E') goto yy543;
+	if (yych == 'e') goto yy543;
 	goto yy56;
-yy601:
+yy541:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 13) YYFILL(13);
 	yych = *YYCURSOR;
-yy602:
+yy542:
 	switch (yych) {
 	case '\t':
 	case ' ':
 	case '-':
-	case '.':	goto yy601;
+	case '.':	goto yy541;
 	case 'A':
-	case 'a':	goto yy598;
+	case 'a':	goto yy538;
 	case 'D':
-	case 'd':	goto yy600;
+	case 'd':	goto yy540;
 	case 'F':
-	case 'f':	goto yy596;
-	case 'I':	goto yy499;
+	case 'f':	goto yy536;
+	case 'I':	goto yy439;
 	case 'J':
-	case 'j':	goto yy503;
+	case 'j':	goto yy443;
 	case 'M':
-	case 'm':	goto yy597;
+	case 'm':	goto yy537;
 	case 'N':
-	case 'n':	goto yy506;
+	case 'n':	goto yy446;
 	case 'O':
-	case 'o':	goto yy505;
+	case 'o':	goto yy445;
 	case 'S':
-	case 's':	goto yy599;
-	case 'V':	goto yy501;
-	case 'X':	goto yy502;
+	case 's':	goto yy539;
+	case 'V':	goto yy441;
+	case 'X':	goto yy442;
 	default:	goto yy56;
 	}
-yy603:
+yy543:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy604;
+	if (yych == 'C') goto yy544;
 	if (yych != 'c') goto yy56;
-yy604:
-	yyaccept = 10;
+yy544:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'D') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'E') goto yy605;
-			if (yych != 'e') goto yy500;
+			if (yych <= 'E') goto yy545;
+			if (yych != 'e') goto yy440;
 		}
 	}
-yy605:
+yy545:
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy606;
+	if (yych == 'M') goto yy546;
 	if (yych != 'm') goto yy56;
-yy606:
+yy546:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy607;
+	if (yych == 'B') goto yy547;
 	if (yych != 'b') goto yy56;
-yy607:
+yy547:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy608;
+	if (yych == 'E') goto yy548;
 	if (yych != 'e') goto yy56;
-yy608:
+yy548:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy564;
-	if (yych == 'r') goto yy564;
+	if (yych == 'R') goto yy504;
+	if (yych == 'r') goto yy504;
 	goto yy56;
-yy609:
+yy549:
 	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy610;
+	if (yych == 'P') goto yy550;
 	if (yych != 'p') goto yy56;
-yy610:
-	yyaccept = 10;
+yy550:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'S') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'T') goto yy611;
-			if (yych != 't') goto yy500;
+			if (yych <= 'T') goto yy551;
+			if (yych != 't') goto yy440;
 		}
 	}
-yy611:
-	yyaccept = 10;
+yy551:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'D') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'E') goto yy612;
-			if (yych != 'e') goto yy500;
+			if (yych <= 'E') goto yy552;
+			if (yych != 'e') goto yy440;
 		}
 	}
-yy612:
+yy552:
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy613;
+	if (yych == 'M') goto yy553;
 	if (yych != 'm') goto yy56;
-yy613:
+yy553:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy614;
+	if (yych == 'B') goto yy554;
 	if (yych != 'b') goto yy56;
-yy614:
+yy554:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy615;
+	if (yych == 'E') goto yy555;
 	if (yych != 'e') goto yy56;
-yy615:
+yy555:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy564;
-	if (yych == 'r') goto yy564;
+	if (yych == 'R') goto yy504;
+	if (yych == 'r') goto yy504;
 	goto yy56;
-yy616:
+yy556:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
-		if (yych == 'R') goto yy617;
+		if (yych == 'R') goto yy557;
 		if (yych <= 'X') goto yy56;
-		goto yy564;
+		goto yy504;
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy56;
 		} else {
-			if (yych == 'y') goto yy564;
+			if (yych == 'y') goto yy504;
 			goto yy56;
 		}
 	}
-yy617:
-	yyaccept = 10;
+yy557:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'B') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'C') goto yy618;
-			if (yych != 'c') goto yy500;
+			if (yych <= 'C') goto yy558;
+			if (yych != 'c') goto yy440;
 		}
 	}
-yy618:
+yy558:
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy564;
-	if (yych == 'h') goto yy564;
+	if (yych == 'H') goto yy504;
+	if (yych == 'h') goto yy504;
 	goto yy56;
-yy619:
+yy559:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy620;
+	if (yych == 'B') goto yy560;
 	if (yych != 'b') goto yy56;
-yy620:
-	yyaccept = 10;
+yy560:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'Q') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'R') goto yy621;
-			if (yych != 'r') goto yy500;
+			if (yych <= 'R') goto yy561;
+			if (yych != 'r') goto yy440;
 		}
 	}
-yy621:
+yy561:
 	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy622;
+	if (yych == 'U') goto yy562;
 	if (yych != 'u') goto yy56;
-yy622:
+yy562:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy623;
+	if (yych == 'A') goto yy563;
 	if (yych != 'a') goto yy56;
-yy623:
+yy563:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy624;
+	if (yych == 'R') goto yy564;
 	if (yych != 'r') goto yy56;
-yy624:
+yy564:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy564;
-	if (yych == 'y') goto yy564;
+	if (yych == 'Y') goto yy504;
+	if (yych == 'y') goto yy504;
 	goto yy56;
-yy625:
+yy565:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy632;
-	if (yych <= '6') goto yy633;
-	if (yych <= '9') goto yy634;
+	if (yych <= '5') goto yy572;
+	if (yych <= '6') goto yy573;
+	if (yych <= '9') goto yy574;
 	goto yy56;
-yy626:
+yy566:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
-yy628:
+yy568:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
-yy629:
+yy569:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
@@ -10847,37 +9943,37 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 10851 "ext/date/lib/parse_date.c"
-yy632:
-	yyaccept = 11;
+#line 9947 "ext/date/lib/parse_date.c"
+yy572:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy521;
-	if (yych <= '/') goto yy515;
-	if (yych <= '9') goto yy637;
-	goto yy515;
-yy633:
-	yyaccept = 11;
+	if (yych == '.') goto yy461;
+	if (yych <= '/') goto yy455;
+	if (yych <= '9') goto yy577;
+	goto yy455;
+yy573:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy521;
-		goto yy515;
+		if (yych == '.') goto yy461;
+		goto yy455;
 	} else {
-		if (yych <= '0') goto yy637;
-		if (yych <= '9') goto yy635;
-		goto yy515;
+		if (yych <= '0') goto yy577;
+		if (yych <= '9') goto yy575;
+		goto yy455;
 	}
-yy634:
-	yyaccept = 11;
+yy574:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy521;
-	if (yych <= '/') goto yy515;
-	if (yych >= ':') goto yy515;
-yy635:
-	yyaccept = 12;
+	if (yych == '.') goto yy461;
+	if (yych <= '/') goto yy455;
+	if (yych >= ':') goto yy455;
+yy575:
+	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy636;
-	if (yych <= '9') goto yy629;
-yy636:
+	if (yych <= '/') goto yy576;
+	if (yych <= '9') goto yy569;
+yy576:
 #line 1367 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
@@ -10891,602 +9987,602 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 10895 "ext/date/lib/parse_date.c"
-yy637:
-	yyaccept = 11;
+#line 9991 "ext/date/lib/parse_date.c"
+yy577:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy525;
-			if (yych <= 0x1F) goto yy515;
-			goto yy525;
+			if (yych == '\t') goto yy465;
+			if (yych <= 0x1F) goto yy455;
+			goto yy465;
 		} else {
-			if (yych == '.') goto yy521;
-			if (yych <= '/') goto yy515;
-			goto yy629;
+			if (yych == '.') goto yy461;
+			if (yych <= '/') goto yy455;
+			goto yy569;
 		}
 	} else {
 		if (yych <= 'P') {
-			if (yych == 'A') goto yy527;
-			if (yych <= 'O') goto yy515;
-			goto yy527;
+			if (yych == 'A') goto yy467;
+			if (yych <= 'O') goto yy455;
+			goto yy467;
 		} else {
 			if (yych <= 'a') {
-				if (yych <= '`') goto yy515;
-				goto yy527;
+				if (yych <= '`') goto yy455;
+				goto yy467;
 			} else {
-				if (yych == 'p') goto yy527;
-				goto yy515;
+				if (yych == 'p') goto yy467;
+				goto yy455;
 			}
 		}
 	}
-yy638:
-	yyaccept = 11;
+yy578:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ':') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy532;
-			if (yych <= 0x1F) goto yy515;
-			goto yy532;
+			if (yych == '\t') goto yy472;
+			if (yych <= 0x1F) goto yy455;
+			goto yy472;
 		} else {
-			if (yych == '.') goto yy517;
-			if (yych <= '9') goto yy515;
-			goto yy517;
+			if (yych == '.') goto yy457;
+			if (yych <= '9') goto yy455;
+			goto yy457;
 		}
 	} else {
 		if (yych <= 'P') {
-			if (yych == 'A') goto yy534;
-			if (yych <= 'O') goto yy515;
-			goto yy534;
+			if (yych == 'A') goto yy474;
+			if (yych <= 'O') goto yy455;
+			goto yy474;
 		} else {
 			if (yych <= 'a') {
-				if (yych <= '`') goto yy515;
-				goto yy534;
+				if (yych <= '`') goto yy455;
+				goto yy474;
 			} else {
-				if (yych == 'p') goto yy534;
-				goto yy515;
+				if (yych == 'p') goto yy474;
+				goto yy455;
 			}
 		}
 	}
-yy639:
-	yyaccept = 11;
+yy579:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ':') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy532;
-			if (yych <= 0x1F) goto yy515;
-			goto yy532;
+			if (yych == '\t') goto yy472;
+			if (yych <= 0x1F) goto yy455;
+			goto yy472;
 		} else {
 			if (yych <= '-') {
-				if (yych <= ',') goto yy515;
-				goto yy626;
+				if (yych <= ',') goto yy455;
+				goto yy566;
 			} else {
-				if (yych <= '.') goto yy625;
-				if (yych <= '9') goto yy515;
-				goto yy517;
+				if (yych <= '.') goto yy565;
+				if (yych <= '9') goto yy455;
+				goto yy457;
 			}
 		}
 	} else {
 		if (yych <= 'P') {
-			if (yych == 'A') goto yy534;
-			if (yych <= 'O') goto yy515;
-			goto yy534;
+			if (yych == 'A') goto yy474;
+			if (yych <= 'O') goto yy455;
+			goto yy474;
 		} else {
 			if (yych <= 'a') {
-				if (yych <= '`') goto yy515;
-				goto yy534;
+				if (yych <= '`') goto yy455;
+				goto yy474;
 			} else {
-				if (yych == 'p') goto yy534;
-				goto yy515;
+				if (yych == 'p') goto yy474;
+				goto yy455;
 			}
 		}
 	}
-yy640:
+yy580:
 	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= ',') goto yy56;
-		if (yych <= '-') goto yy679;
-		goto yy626;
+		if (yych <= '-') goto yy619;
+		goto yy566;
 	} else {
 		if (yych <= '/') goto yy56;
-		if (yych <= '9') goto yy642;
+		if (yych <= '9') goto yy582;
 		goto yy56;
 	}
-yy641:
+yy581:
 	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= ',') goto yy56;
-		if (yych <= '-') goto yy679;
-		goto yy626;
+		if (yych <= '-') goto yy619;
+		goto yy566;
 	} else {
 		if (yych <= '/') goto yy56;
 		if (yych >= '3') goto yy56;
 	}
-yy642:
+yy582:
 	yych = *++YYCURSOR;
 	if (yych <= ',') goto yy56;
-	if (yych <= '-') goto yy679;
-	if (yych <= '.') goto yy626;
+	if (yych <= '-') goto yy619;
+	if (yych <= '.') goto yy566;
 	goto yy56;
-yy643:
+yy583:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'A') goto yy675;
+		if (yych == 'A') goto yy615;
 		if (yych <= 'T') goto yy56;
-		goto yy674;
+		goto yy614;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
-			goto yy675;
+			goto yy615;
 		} else {
-			if (yych == 'u') goto yy674;
+			if (yych == 'u') goto yy614;
 			goto yy56;
 		}
 	}
-yy644:
+yy584:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy672;
-	if (yych == 'e') goto yy672;
+	if (yych == 'E') goto yy612;
+	if (yych == 'e') goto yy612;
 	goto yy56;
-yy645:
+yy585:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy669;
-	if (yych == 'a') goto yy669;
+	if (yych == 'A') goto yy609;
+	if (yych == 'a') goto yy609;
 	goto yy56;
-yy646:
+yy586:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'P') goto yy666;
+		if (yych == 'P') goto yy606;
 		if (yych <= 'T') goto yy56;
-		goto yy665;
+		goto yy605;
 	} else {
 		if (yych <= 'p') {
 			if (yych <= 'o') goto yy56;
-			goto yy666;
+			goto yy606;
 		} else {
-			if (yych == 'u') goto yy665;
+			if (yych == 'u') goto yy605;
 			goto yy56;
 		}
 	}
-yy647:
+yy587:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy662;
-	if (yych == 'e') goto yy662;
+	if (yych == 'E') goto yy602;
+	if (yych == 'e') goto yy602;
 	goto yy56;
-yy648:
+yy588:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy660;
-	if (yych == 'c') goto yy660;
+	if (yych == 'C') goto yy600;
+	if (yych == 'c') goto yy600;
 	goto yy56;
-yy649:
+yy589:
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy658;
-	if (yych == 'o') goto yy658;
+	if (yych == 'O') goto yy598;
+	if (yych == 'o') goto yy598;
 	goto yy56;
-yy650:
+yy590:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy651;
+	if (yych == 'E') goto yy591;
 	if (yych != 'e') goto yy56;
-yy651:
+yy591:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy652;
+	if (yych == 'C') goto yy592;
 	if (yych != 'c') goto yy56;
-yy652:
-	yyaccept = 10;
+yy592:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych >= '.') goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych >= '.') goto yy496;
 		}
 	} else {
 		if (yych <= 'D') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
-		} else {
-			if (yych <= 'E') goto yy605;
-			if (yych == 'e') goto yy605;
-			goto yy500;
-		}
-	}
-yy653:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy557;
-	if (yych <= '0') goto yy654;
-	if (yych <= '2') goto yy655;
-	if (yych <= '3') goto yy656;
-	goto yy557;
-yy654:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy559;
-	if (yych <= '9') goto yy657;
-	goto yy559;
-yy655:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy559;
-	if (yych <= '9') goto yy657;
-	goto yy559;
-yy656:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy559;
-	if (yych <= '1') goto yy657;
-	if (yych <= '9') goto yy565;
-	goto yy559;
-yy657:
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
+		} else {
+			if (yych <= 'E') goto yy545;
+			if (yych == 'e') goto yy545;
+			goto yy440;
+		}
+	}
+yy593:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy559;
-	if (yych <= '9') goto yy566;
-	goto yy559;
-yy658:
+	if (yych <= '/') goto yy497;
+	if (yych <= '0') goto yy594;
+	if (yych <= '2') goto yy595;
+	if (yych <= '3') goto yy596;
+	goto yy497;
+yy594:
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy499;
+	if (yych <= '9') goto yy597;
+	goto yy499;
+yy595:
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy499;
+	if (yych <= '9') goto yy597;
+	goto yy499;
+yy596:
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy499;
+	if (yych <= '1') goto yy597;
+	if (yych <= '9') goto yy505;
+	goto yy499;
+yy597:
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy499;
+	if (yych <= '9') goto yy506;
+	goto yy499;
+yy598:
 	yych = *++YYCURSOR;
-	if (yych == 'V') goto yy659;
+	if (yych == 'V') goto yy599;
 	if (yych != 'v') goto yy56;
-yy659:
-	yyaccept = 10;
+yy599:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych <= '-') goto yy653;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych <= '-') goto yy593;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'D') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'E') goto yy560;
-			if (yych == 'e') goto yy560;
-			goto yy500;
+			if (yych <= 'E') goto yy500;
+			if (yych == 'e') goto yy500;
+			goto yy440;
 		}
 	}
-yy660:
+yy600:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy661;
+	if (yych == 'T') goto yy601;
 	if (yych != 't') goto yy56;
-yy661:
-	yyaccept = 10;
+yy601:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych <= '-') goto yy653;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych <= '-') goto yy593;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'N') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'O') goto yy570;
-			if (yych == 'o') goto yy570;
-			goto yy500;
+			if (yych <= 'O') goto yy510;
+			if (yych == 'o') goto yy510;
+			goto yy440;
 		}
 	}
-yy662:
+yy602:
 	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy663;
+	if (yych == 'P') goto yy603;
 	if (yych != 'p') goto yy56;
-yy663:
-	yyaccept = 10;
+yy603:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych <= '-') goto yy653;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych <= '-') goto yy593;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'S') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'T') goto yy664;
-			if (yych != 't') goto yy500;
+			if (yych <= 'T') goto yy604;
+			if (yych != 't') goto yy440;
 		}
 	}
-yy664:
-	yyaccept = 10;
+yy604:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych <= '-') goto yy653;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych <= '-') goto yy593;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'D') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'E') goto yy612;
-			if (yych == 'e') goto yy612;
-			goto yy500;
+			if (yych <= 'E') goto yy552;
+			if (yych == 'e') goto yy552;
+			goto yy440;
 		}
 	}
-yy665:
+yy605:
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy668;
-	if (yych == 'g') goto yy668;
+	if (yych == 'G') goto yy608;
+	if (yych == 'g') goto yy608;
 	goto yy56;
-yy666:
+yy606:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy667;
+	if (yych == 'R') goto yy607;
 	if (yych != 'r') goto yy56;
-yy667:
-	yyaccept = 10;
+yy607:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych <= '-') goto yy653;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych <= '-') goto yy593;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'H') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'I') goto yy576;
-			if (yych == 'i') goto yy576;
-			goto yy500;
+			if (yych <= 'I') goto yy516;
+			if (yych == 'i') goto yy516;
+			goto yy440;
 		}
 	}
-yy668:
-	yyaccept = 10;
+yy608:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych <= '-') goto yy653;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych <= '-') goto yy593;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'T') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'U') goto yy578;
-			if (yych == 'u') goto yy578;
-			goto yy500;
+			if (yych <= 'U') goto yy518;
+			if (yych == 'u') goto yy518;
+			goto yy440;
 		}
 	}
-yy669:
+yy609:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
-		if (yych == 'R') goto yy670;
+		if (yych == 'R') goto yy610;
 		if (yych <= 'X') goto yy56;
-		goto yy671;
+		goto yy611;
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy56;
 		} else {
-			if (yych == 'y') goto yy671;
+			if (yych == 'y') goto yy611;
 			goto yy56;
 		}
 	}
-yy670:
-	yyaccept = 10;
+yy610:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych <= '-') goto yy653;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych <= '-') goto yy593;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'B') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'C') goto yy618;
-			if (yych == 'c') goto yy618;
-			goto yy500;
+			if (yych <= 'C') goto yy558;
+			if (yych == 'c') goto yy558;
+			goto yy440;
 		}
 	}
-yy671:
-	yyaccept = 10;
+yy611:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
 		if (yych <= '\t') {
-			if (yych <= 0x08) goto yy500;
-			goto yy556;
+			if (yych <= 0x08) goto yy440;
+			goto yy496;
 		} else {
-			if (yych == ' ') goto yy556;
-			goto yy500;
+			if (yych == ' ') goto yy496;
+			goto yy440;
 		}
 	} else {
 		if (yych <= '.') {
-			if (yych <= '-') goto yy653;
-			goto yy556;
+			if (yych <= '-') goto yy593;
+			goto yy496;
 		} else {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		}
 	}
-yy672:
+yy612:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy673;
+	if (yych == 'B') goto yy613;
 	if (yych != 'b') goto yy56;
-yy673:
-	yyaccept = 10;
+yy613:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych <= '-') goto yy653;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych <= '-') goto yy593;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'Q') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'R') goto yy621;
-			if (yych == 'r') goto yy621;
-			goto yy500;
+			if (yych <= 'R') goto yy561;
+			if (yych == 'r') goto yy561;
+			goto yy440;
 		}
 	}
-yy674:
+yy614:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'L') goto yy678;
+		if (yych == 'L') goto yy618;
 		if (yych <= 'M') goto yy56;
-		goto yy677;
+		goto yy617;
 	} else {
 		if (yych <= 'l') {
 			if (yych <= 'k') goto yy56;
-			goto yy678;
+			goto yy618;
 		} else {
-			if (yych == 'n') goto yy677;
+			if (yych == 'n') goto yy617;
 			goto yy56;
 		}
 	}
-yy675:
+yy615:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy676;
+	if (yych == 'N') goto yy616;
 	if (yych != 'n') goto yy56;
-yy676:
-	yyaccept = 10;
+yy616:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych <= '-') goto yy653;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych <= '-') goto yy593;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'T') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'U') goto yy583;
-			if (yych == 'u') goto yy583;
-			goto yy500;
+			if (yych <= 'U') goto yy523;
+			if (yych == 'u') goto yy523;
+			goto yy440;
 		}
 	}
-yy677:
-	yyaccept = 10;
+yy617:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych <= '-') goto yy653;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych <= '-') goto yy593;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'D') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'E') goto yy564;
-			if (yych == 'e') goto yy564;
-			goto yy500;
+			if (yych <= 'E') goto yy504;
+			if (yych == 'e') goto yy504;
+			goto yy440;
 		}
 	}
-yy678:
-	yyaccept = 10;
+yy618:
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy556;
-			goto yy500;
+			if (yych == '\t') goto yy496;
+			goto yy440;
 		} else {
-			if (yych <= ' ') goto yy556;
-			if (yych <= ',') goto yy500;
-			if (yych <= '-') goto yy653;
-			goto yy556;
+			if (yych <= ' ') goto yy496;
+			if (yych <= ',') goto yy440;
+			if (yych <= '-') goto yy593;
+			goto yy496;
 		}
 	} else {
 		if (yych <= 'X') {
-			if (yych <= '/') goto yy500;
-			if (yych <= '9') goto yy558;
-			goto yy500;
+			if (yych <= '/') goto yy440;
+			if (yych <= '9') goto yy498;
+			goto yy440;
 		} else {
-			if (yych <= 'Y') goto yy564;
-			if (yych == 'y') goto yy564;
-			goto yy500;
+			if (yych <= 'Y') goto yy504;
+			if (yych == 'y') goto yy504;
+			goto yy440;
 		}
 	}
-yy679:
+yy619:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy680;
-	if (yych <= '3') goto yy682;
-	if (yych <= '9') goto yy683;
+	if (yych <= '2') goto yy620;
+	if (yych <= '3') goto yy622;
+	if (yych <= '9') goto yy623;
 	goto yy56;
-yy680:
-	yyaccept = 13;
+yy620:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy681;
-		if (yych <= '9') goto yy689;
-		if (yych >= 'n') goto yy685;
+		if (yych <= '/') goto yy621;
+		if (yych <= '9') goto yy629;
+		if (yych >= 'n') goto yy625;
 	} else {
 		if (yych <= 'r') {
-			if (yych >= 'r') goto yy686;
+			if (yych >= 'r') goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
 		}
 	}
-yy681:
+yy621:
 #line 1326 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
@@ -11500,102 +10596,102 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 11504 "ext/date/lib/parse_date.c"
-yy682:
-	yyaccept = 13;
+#line 10600 "ext/date/lib/parse_date.c"
+yy622:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
 		if (yych <= '1') {
-			if (yych <= '/') goto yy681;
-			goto yy689;
+			if (yych <= '/') goto yy621;
+			goto yy629;
 		} else {
-			if (yych <= '9') goto yy628;
-			if (yych <= 'm') goto yy681;
-			goto yy685;
+			if (yych <= '9') goto yy568;
+			if (yych <= 'm') goto yy621;
+			goto yy625;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy681;
-			goto yy686;
+			if (yych <= 'q') goto yy621;
+			goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
-			goto yy681;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
+			goto yy621;
 		}
 	}
-yy683:
-	yyaccept = 13;
+yy623:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy681;
-		if (yych <= '9') goto yy628;
-		if (yych <= 'm') goto yy681;
-		goto yy685;
+		if (yych <= '/') goto yy621;
+		if (yych <= '9') goto yy568;
+		if (yych <= 'm') goto yy621;
+		goto yy625;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy681;
-			goto yy686;
+			if (yych <= 'q') goto yy621;
+			goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
-			goto yy681;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
+			goto yy621;
 		}
 	}
-yy684:
+yy624:
 	yych = *++YYCURSOR;
-	if (yych == 't') goto yy688;
+	if (yych == 't') goto yy628;
 	goto yy56;
-yy685:
+yy625:
 	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy688;
+	if (yych == 'd') goto yy628;
 	goto yy56;
-yy686:
+yy626:
 	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy688;
+	if (yych == 'd') goto yy628;
 	goto yy56;
-yy687:
+yy627:
 	yych = *++YYCURSOR;
 	if (yych != 'h') goto yy56;
-yy688:
+yy628:
 	yych = *++YYCURSOR;
-	goto yy681;
-yy689:
-	yyaccept = 13;
+	goto yy621;
+yy629:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy681;
-		if (yych <= '9') goto yy629;
-		if (yych <= 'm') goto yy681;
-		goto yy685;
+		if (yych <= '/') goto yy621;
+		if (yych <= '9') goto yy569;
+		if (yych <= 'm') goto yy621;
+		goto yy625;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy681;
-			goto yy686;
+			if (yych <= 'q') goto yy621;
+			goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
-			goto yy681;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
+			goto yy621;
 		}
 	}
-yy690:
-	yyaccept = 14;
+yy630:
+	yyaccept = 13;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
 		if (yych <= '/') {
-			if (yych >= '/') goto yy747;
+			if (yych >= '/') goto yy687;
 		} else {
-			if (yych <= '9') goto yy693;
-			if (yych >= 'n') goto yy744;
+			if (yych <= '9') goto yy633;
+			if (yych >= 'n') goto yy684;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych >= 'r') goto yy745;
+			if (yych >= 'r') goto yy685;
 		} else {
-			if (yych <= 's') goto yy743;
-			if (yych <= 't') goto yy746;
+			if (yych <= 's') goto yy683;
+			if (yych <= 't') goto yy686;
 		}
 	}
-yy691:
+yy631:
 #line 1270 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
@@ -11611,113 +10707,113 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_AMERICAN;
 	}
-#line 11615 "ext/date/lib/parse_date.c"
-yy692:
-	yyaccept = 14;
+#line 10711 "ext/date/lib/parse_date.c"
+yy632:
+	yyaccept = 13;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
 		if (yych <= '/') {
-			if (yych <= '.') goto yy691;
-			goto yy747;
+			if (yych <= '.') goto yy631;
+			goto yy687;
 		} else {
-			if (yych <= '1') goto yy693;
-			if (yych <= 'm') goto yy691;
-			goto yy744;
+			if (yych <= '1') goto yy633;
+			if (yych <= 'm') goto yy631;
+			goto yy684;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy691;
-			goto yy745;
+			if (yych <= 'q') goto yy631;
+			goto yy685;
 		} else {
-			if (yych <= 's') goto yy743;
-			if (yych <= 't') goto yy746;
-			goto yy691;
+			if (yych <= 's') goto yy683;
+			if (yych <= 't') goto yy686;
+			goto yy631;
 		}
 	}
-yy693:
-	yyaccept = 14;
+yy633:
+	yyaccept = 13;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych == '/') goto yy747;
-		if (yych <= 'm') goto yy691;
-		goto yy744;
+		if (yych == '/') goto yy687;
+		if (yych <= 'm') goto yy631;
+		goto yy684;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy691;
-			goto yy745;
+			if (yych <= 'q') goto yy631;
+			goto yy685;
 		} else {
-			if (yych <= 's') goto yy743;
-			if (yych <= 't') goto yy746;
-			goto yy691;
+			if (yych <= 's') goto yy683;
+			if (yych <= 't') goto yy686;
+			goto yy631;
 		}
 	}
-yy694:
+yy634:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'A') goto yy742;
+		if (yych == 'A') goto yy682;
 		if (yych <= 'T') goto yy56;
-		goto yy741;
+		goto yy681;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
-			goto yy742;
+			goto yy682;
 		} else {
-			if (yych == 'u') goto yy741;
+			if (yych == 'u') goto yy681;
 			goto yy56;
 		}
 	}
-yy695:
+yy635:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy740;
-	if (yych == 'e') goto yy740;
+	if (yych == 'E') goto yy680;
+	if (yych == 'e') goto yy680;
 	goto yy56;
-yy696:
+yy636:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy739;
-	if (yych == 'a') goto yy739;
+	if (yych == 'A') goto yy679;
+	if (yych == 'a') goto yy679;
 	goto yy56;
-yy697:
+yy637:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'P') goto yy738;
+		if (yych == 'P') goto yy678;
 		if (yych <= 'T') goto yy56;
-		goto yy737;
+		goto yy677;
 	} else {
 		if (yych <= 'p') {
 			if (yych <= 'o') goto yy56;
-			goto yy738;
+			goto yy678;
 		} else {
-			if (yych == 'u') goto yy737;
+			if (yych == 'u') goto yy677;
 			goto yy56;
 		}
 	}
-yy698:
+yy638:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy735;
-	if (yych == 'e') goto yy735;
+	if (yych == 'E') goto yy675;
+	if (yych == 'e') goto yy675;
 	goto yy56;
-yy699:
+yy639:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy734;
-	if (yych == 'c') goto yy734;
+	if (yych == 'C') goto yy674;
+	if (yych == 'c') goto yy674;
 	goto yy56;
-yy700:
+yy640:
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy733;
-	if (yych == 'o') goto yy733;
+	if (yych == 'O') goto yy673;
+	if (yych == 'o') goto yy673;
 	goto yy56;
-yy701:
+yy641:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy702;
+	if (yych == 'E') goto yy642;
 	if (yych != 'e') goto yy56;
-yy702:
+yy642:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy703;
+	if (yych == 'C') goto yy643;
 	if (yych != 'c') goto yy56;
-yy703:
+yy643:
 	yych = *++YYCURSOR;
 	if (yych != '/') goto yy56;
-yy704:
+yy644:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
@@ -11734,19 +10830,19 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	if (yych != ':') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy710;
-	if (yych <= '2') goto yy711;
+	if (yych <= '1') goto yy650;
+	if (yych <= '2') goto yy651;
 	goto yy56;
-yy710:
+yy650:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy712;
+	if (yych <= '9') goto yy652;
 	goto yy56;
-yy711:
+yy651:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '5') goto yy56;
-yy712:
+yy652:
 	yych = *++YYCURSOR;
 	if (yych != ':') goto yy56;
 	yych = *++YYCURSOR;
@@ -11759,57 +10855,57 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	if (yych != ':') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy717;
-	if (yych <= '6') goto yy718;
+	if (yych <= '5') goto yy657;
+	if (yych <= '6') goto yy658;
 	goto yy56;
-yy717:
+yy657:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy719;
+	if (yych <= '9') goto yy659;
 	goto yy56;
-yy718:
+yy658:
 	yych = *++YYCURSOR;
 	if (yych != '0') goto yy56;
-yy719:
+yy659:
 	yych = *++YYCURSOR;
-	if (yych == '\t') goto yy720;
+	if (yych == '\t') goto yy660;
 	if (yych != ' ') goto yy56;
-yy720:
+yy660:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
 	yych = *YYCURSOR;
 	if (yych <= '*') {
 		if (yych <= '\t') {
 			if (yych <= 0x08) goto yy56;
-			goto yy720;
+			goto yy660;
 		} else {
-			if (yych == ' ') goto yy720;
+			if (yych == ' ') goto yy660;
 			goto yy56;
 		}
 	} else {
 		if (yych <= '-') {
 			if (yych == ',') goto yy56;
-			goto yy723;
+			goto yy663;
 		} else {
 			if (yych != 'G') goto yy56;
 		}
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy731;
+	if (yych == 'M') goto yy671;
 	goto yy56;
-yy723:
+yy663:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy724;
-	if (yych <= '2') goto yy726;
-	if (yych <= '9') goto yy727;
+	if (yych <= '1') goto yy664;
+	if (yych <= '2') goto yy666;
+	if (yych <= '9') goto yy667;
 	goto yy56;
-yy724:
+yy664:
 	++YYCURSOR;
-	if ((yych = *YYCURSOR) <= '/') goto yy725;
-	if (yych <= '9') goto yy727;
-	if (yych <= ':') goto yy728;
-yy725:
+	if ((yych = *YYCURSOR) <= '/') goto yy665;
+	if (yych <= '9') goto yy667;
+	if (yych <= ':') goto yy668;
+yy665:
 #line 1553 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
@@ -11830,261 +10926,261 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 11834 "ext/date/lib/parse_date.c"
-yy726:
+#line 10930 "ext/date/lib/parse_date.c"
+yy666:
 	yych = *++YYCURSOR;
 	if (yych <= '5') {
-		if (yych <= '/') goto yy725;
-		if (yych >= '5') goto yy729;
+		if (yych <= '/') goto yy665;
+		if (yych >= '5') goto yy669;
 	} else {
-		if (yych <= '9') goto yy730;
-		if (yych <= ':') goto yy728;
-		goto yy725;
+		if (yych <= '9') goto yy670;
+		if (yych <= ':') goto yy668;
+		goto yy665;
 	}
-yy727:
+yy667:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy725;
-	if (yych <= '5') goto yy729;
-	if (yych <= '9') goto yy730;
-	if (yych >= ';') goto yy725;
-yy728:
+	if (yych <= '/') goto yy665;
+	if (yych <= '5') goto yy669;
+	if (yych <= '9') goto yy670;
+	if (yych >= ';') goto yy665;
+yy668:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy725;
-	if (yych <= '5') goto yy729;
-	if (yych <= '9') goto yy730;
-	goto yy725;
-yy729:
+	if (yych <= '/') goto yy665;
+	if (yych <= '5') goto yy669;
+	if (yych <= '9') goto yy670;
+	goto yy665;
+yy669:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy725;
-	if (yych >= ':') goto yy725;
-yy730:
+	if (yych <= '/') goto yy665;
+	if (yych >= ':') goto yy665;
+yy670:
 	yych = *++YYCURSOR;
-	goto yy725;
-yy731:
+	goto yy665;
+yy671:
 	yych = *++YYCURSOR;
 	if (yych != 'T') goto yy56;
 	yych = *++YYCURSOR;
-	if (yych == '+') goto yy723;
-	if (yych == '-') goto yy723;
+	if (yych == '+') goto yy663;
+	if (yych == '-') goto yy663;
 	goto yy56;
-yy733:
+yy673:
 	yych = *++YYCURSOR;
-	if (yych == 'V') goto yy703;
-	if (yych == 'v') goto yy703;
+	if (yych == 'V') goto yy643;
+	if (yych == 'v') goto yy643;
 	goto yy56;
-yy734:
+yy674:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy703;
-	if (yych == 't') goto yy703;
+	if (yych == 'T') goto yy643;
+	if (yych == 't') goto yy643;
 	goto yy56;
-yy735:
+yy675:
 	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy736;
+	if (yych == 'P') goto yy676;
 	if (yych != 'p') goto yy56;
-yy736:
+yy676:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
-		if (yych == '/') goto yy704;
+		if (yych == '/') goto yy644;
 		goto yy56;
 	} else {
-		if (yych <= 'T') goto yy703;
-		if (yych == 't') goto yy703;
+		if (yych <= 'T') goto yy643;
+		if (yych == 't') goto yy643;
 		goto yy56;
 	}
-yy737:
+yy677:
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy703;
-	if (yych == 'g') goto yy703;
+	if (yych == 'G') goto yy643;
+	if (yych == 'g') goto yy643;
 	goto yy56;
-yy738:
+yy678:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy703;
-	if (yych == 'r') goto yy703;
+	if (yych == 'R') goto yy643;
+	if (yych == 'r') goto yy643;
 	goto yy56;
-yy739:
+yy679:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
-		if (yych == 'R') goto yy703;
+		if (yych == 'R') goto yy643;
 		if (yych <= 'X') goto yy56;
-		goto yy703;
+		goto yy643;
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy56;
-			goto yy703;
+			goto yy643;
 		} else {
-			if (yych == 'y') goto yy703;
+			if (yych == 'y') goto yy643;
 			goto yy56;
 		}
 	}
-yy740:
+yy680:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy703;
-	if (yych == 'b') goto yy703;
+	if (yych == 'B') goto yy643;
+	if (yych == 'b') goto yy643;
 	goto yy56;
-yy741:
+yy681:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'L') goto yy703;
+		if (yych == 'L') goto yy643;
 		if (yych <= 'M') goto yy56;
-		goto yy703;
+		goto yy643;
 	} else {
 		if (yych <= 'l') {
 			if (yych <= 'k') goto yy56;
-			goto yy703;
+			goto yy643;
 		} else {
-			if (yych == 'n') goto yy703;
+			if (yych == 'n') goto yy643;
 			goto yy56;
 		}
 	}
-yy742:
+yy682:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy703;
-	if (yych == 'n') goto yy703;
+	if (yych == 'N') goto yy643;
+	if (yych == 'n') goto yy643;
 	goto yy56;
-yy743:
+yy683:
 	yych = *++YYCURSOR;
-	if (yych == 't') goto yy752;
+	if (yych == 't') goto yy692;
 	goto yy56;
-yy744:
+yy684:
 	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy752;
+	if (yych == 'd') goto yy692;
 	goto yy56;
-yy745:
+yy685:
 	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy752;
+	if (yych == 'd') goto yy692;
 	goto yy56;
-yy746:
+yy686:
 	yych = *++YYCURSOR;
-	if (yych == 'h') goto yy752;
+	if (yych == 'h') goto yy692;
 	goto yy56;
-yy747:
+yy687:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy691;
-	if (yych >= ':') goto yy691;
+	if (yych <= '/') goto yy631;
+	if (yych >= ':') goto yy631;
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy691;
-	if (yych >= ':') goto yy691;
+	if (yych <= '/') goto yy631;
+	if (yych >= ':') goto yy631;
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy691;
-	if (yych >= ':') goto yy691;
+	if (yych <= '/') goto yy631;
+	if (yych >= ':') goto yy631;
 	yych = *++YYCURSOR;
-	goto yy691;
-yy752:
-	yyaccept = 14;
+	goto yy631;
+yy692:
+	yyaccept = 13;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '/') goto yy747;
-	goto yy691;
-yy753:
+	if (yych == '/') goto yy687;
+	goto yy631;
+yy693:
 	yych = *++YYCURSOR;
 	if (yych <= ',') {
-		if (yych == '\t') goto yy755;
-		goto yy602;
+		if (yych == '\t') goto yy695;
+		goto yy542;
 	} else {
-		if (yych <= '-') goto yy756;
-		if (yych <= '.') goto yy755;
-		if (yych >= '0') goto yy602;
+		if (yych <= '-') goto yy696;
+		if (yych <= '.') goto yy695;
+		if (yych >= '0') goto yy542;
 	}
-yy754:
+yy694:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case 'A':
-	case 'a':	goto yy697;
+	case 'a':	goto yy637;
 	case 'D':
-	case 'd':	goto yy701;
+	case 'd':	goto yy641;
 	case 'F':
-	case 'f':	goto yy695;
+	case 'f':	goto yy635;
 	case 'J':
-	case 'j':	goto yy694;
+	case 'j':	goto yy634;
 	case 'M':
-	case 'm':	goto yy696;
+	case 'm':	goto yy636;
 	case 'N':
-	case 'n':	goto yy700;
+	case 'n':	goto yy640;
 	case 'O':
-	case 'o':	goto yy699;
+	case 'o':	goto yy639;
 	case 'S':
-	case 's':	goto yy698;
+	case 's':	goto yy638;
 	default:	goto yy56;
 	}
-yy755:
+yy695:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy602;
-	if (yych <= '0') goto yy760;
-	if (yych <= '1') goto yy761;
-	if (yych <= '9') goto yy762;
-	goto yy602;
-yy756:
+	if (yych <= '/') goto yy542;
+	if (yych <= '0') goto yy700;
+	if (yych <= '1') goto yy701;
+	if (yych <= '9') goto yy702;
+	goto yy542;
+yy696:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy602;
-	if (yych <= '0') goto yy757;
-	if (yych <= '1') goto yy758;
-	if (yych <= '9') goto yy759;
-	goto yy602;
-yy757:
+	if (yych <= '/') goto yy542;
+	if (yych <= '0') goto yy697;
+	if (yych <= '1') goto yy698;
+	if (yych <= '9') goto yy699;
+	goto yy542;
+yy697:
 	yych = *++YYCURSOR;
 	if (yych <= ',') goto yy56;
-	if (yych <= '.') goto yy626;
+	if (yych <= '.') goto yy566;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy759;
+	if (yych <= '9') goto yy699;
 	goto yy56;
-yy758:
+yy698:
 	yych = *++YYCURSOR;
 	if (yych <= ',') goto yy56;
-	if (yych <= '.') goto yy626;
+	if (yych <= '.') goto yy566;
 	if (yych <= '/') goto yy56;
 	if (yych >= '3') goto yy56;
-yy759:
+yy699:
 	yych = *++YYCURSOR;
 	if (yych <= ',') goto yy56;
-	if (yych <= '.') goto yy626;
+	if (yych <= '.') goto yy566;
 	goto yy56;
-yy760:
+yy700:
 	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= ',') goto yy56;
-		if (yych <= '-') goto yy626;
-		goto yy763;
+		if (yych <= '-') goto yy566;
+		goto yy703;
 	} else {
 		if (yych <= '/') goto yy56;
-		if (yych <= '9') goto yy762;
+		if (yych <= '9') goto yy702;
 		goto yy56;
 	}
-yy761:
+yy701:
 	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= ',') goto yy56;
-		if (yych <= '-') goto yy626;
-		goto yy763;
+		if (yych <= '-') goto yy566;
+		goto yy703;
 	} else {
 		if (yych <= '/') goto yy56;
 		if (yych >= '3') goto yy56;
 	}
-yy762:
+yy702:
 	yych = *++YYCURSOR;
 	if (yych <= ',') goto yy56;
-	if (yych <= '-') goto yy626;
+	if (yych <= '-') goto yy566;
 	if (yych >= '/') goto yy56;
-yy763:
+yy703:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy635;
+	if (yych <= '9') goto yy575;
 	goto yy56;
-yy765:
+yy705:
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy809;
+	if (yych == '-') goto yy749;
 	if (yych <= '/') goto yy60;
-	if (yych <= '9') goto yy807;
+	if (yych <= '9') goto yy747;
 	goto yy60;
-yy766:
+yy706:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '0':	goto yy775;
-	case '1':	goto yy776;
+	case '0':	goto yy715;
+	case '1':	goto yy716;
 	case '2':
 	case '3':
 	case '4':
@@ -12092,231 +11188,231 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy777;
+	case '9':	goto yy717;
 	case 'A':
-	case 'a':	goto yy770;
+	case 'a':	goto yy710;
 	case 'D':
-	case 'd':	goto yy774;
+	case 'd':	goto yy714;
 	case 'F':
-	case 'f':	goto yy768;
+	case 'f':	goto yy708;
 	case 'J':
-	case 'j':	goto yy767;
+	case 'j':	goto yy707;
 	case 'M':
-	case 'm':	goto yy769;
+	case 'm':	goto yy709;
 	case 'N':
-	case 'n':	goto yy773;
+	case 'n':	goto yy713;
 	case 'O':
-	case 'o':	goto yy772;
+	case 'o':	goto yy712;
 	case 'S':
-	case 's':	goto yy771;
+	case 's':	goto yy711;
 	default:	goto yy56;
 	}
-yy767:
+yy707:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'A') goto yy806;
+		if (yych == 'A') goto yy746;
 		if (yych <= 'T') goto yy56;
-		goto yy805;
+		goto yy745;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
-			goto yy806;
+			goto yy746;
 		} else {
-			if (yych == 'u') goto yy805;
+			if (yych == 'u') goto yy745;
 			goto yy56;
 		}
 	}
-yy768:
+yy708:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy804;
-	if (yych == 'e') goto yy804;
+	if (yych == 'E') goto yy744;
+	if (yych == 'e') goto yy744;
 	goto yy56;
-yy769:
+yy709:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy803;
-	if (yych == 'a') goto yy803;
+	if (yych == 'A') goto yy743;
+	if (yych == 'a') goto yy743;
 	goto yy56;
-yy770:
+yy710:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'P') goto yy802;
+		if (yych == 'P') goto yy742;
 		if (yych <= 'T') goto yy56;
-		goto yy801;
+		goto yy741;
 	} else {
 		if (yych <= 'p') {
 			if (yych <= 'o') goto yy56;
-			goto yy802;
+			goto yy742;
 		} else {
-			if (yych == 'u') goto yy801;
+			if (yych == 'u') goto yy741;
 			goto yy56;
 		}
 	}
-yy771:
+yy711:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy799;
-	if (yych == 'e') goto yy799;
+	if (yych == 'E') goto yy739;
+	if (yych == 'e') goto yy739;
 	goto yy56;
-yy772:
+yy712:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy798;
-	if (yych == 'c') goto yy798;
+	if (yych == 'C') goto yy738;
+	if (yych == 'c') goto yy738;
 	goto yy56;
-yy773:
+yy713:
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy797;
-	if (yych == 'o') goto yy797;
+	if (yych == 'O') goto yy737;
+	if (yych == 'o') goto yy737;
 	goto yy56;
-yy774:
+yy714:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy789;
-	if (yych == 'e') goto yy789;
+	if (yych == 'E') goto yy729;
+	if (yych == 'e') goto yy729;
 	goto yy56;
-yy775:
+yy715:
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy778;
+	if (yych == '-') goto yy718;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy782;
+	if (yych <= '9') goto yy722;
 	goto yy56;
-yy776:
+yy716:
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy778;
+	if (yych == '-') goto yy718;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy782;
+	if (yych <= '2') goto yy722;
 	goto yy56;
-yy777:
+yy717:
 	yych = *++YYCURSOR;
 	if (yych != '-') goto yy56;
-yy778:
+yy718:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy779;
-	if (yych <= '3') goto yy780;
-	if (yych <= '9') goto yy781;
+	if (yych <= '2') goto yy719;
+	if (yych <= '3') goto yy720;
+	if (yych <= '9') goto yy721;
 	goto yy56;
-yy779:
-	yyaccept = 13;
+yy719:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy681;
-		if (yych <= '9') goto yy781;
-		if (yych <= 'm') goto yy681;
-		goto yy685;
+		if (yych <= '/') goto yy621;
+		if (yych <= '9') goto yy721;
+		if (yych <= 'm') goto yy621;
+		goto yy625;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy681;
-			goto yy686;
+			if (yych <= 'q') goto yy621;
+			goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
-			goto yy681;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
+			goto yy621;
 		}
 	}
-yy780:
-	yyaccept = 13;
+yy720:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy681;
-		if (yych <= '1') goto yy781;
-		if (yych <= 'm') goto yy681;
-		goto yy685;
+		if (yych <= '/') goto yy621;
+		if (yych <= '1') goto yy721;
+		if (yych <= 'm') goto yy621;
+		goto yy625;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy681;
-			goto yy686;
+			if (yych <= 'q') goto yy621;
+			goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
-			goto yy681;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
+			goto yy621;
 		}
 	}
-yy781:
-	yyaccept = 13;
+yy721:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'q') {
-		if (yych == 'n') goto yy685;
-		goto yy681;
+		if (yych == 'n') goto yy625;
+		goto yy621;
 	} else {
-		if (yych <= 'r') goto yy686;
-		if (yych <= 's') goto yy684;
-		if (yych <= 't') goto yy687;
-		goto yy681;
+		if (yych <= 'r') goto yy626;
+		if (yych <= 's') goto yy624;
+		if (yych <= 't') goto yy627;
+		goto yy621;
 	}
-yy782:
+yy722:
 	yych = *++YYCURSOR;
 	if (yych != '-') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '2') {
 		if (yych <= '/') goto yy56;
-		if (yych >= '1') goto yy785;
+		if (yych >= '1') goto yy725;
 	} else {
-		if (yych <= '3') goto yy786;
-		if (yych <= '9') goto yy781;
+		if (yych <= '3') goto yy726;
+		if (yych <= '9') goto yy721;
 		goto yy56;
 	}
-	yyaccept = 13;
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy681;
-		if (yych <= '9') goto yy787;
-		if (yych <= 'm') goto yy681;
-		goto yy685;
+		if (yych <= '/') goto yy621;
+		if (yych <= '9') goto yy727;
+		if (yych <= 'm') goto yy621;
+		goto yy625;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy681;
-			goto yy686;
+			if (yych <= 'q') goto yy621;
+			goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
-			goto yy681;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
+			goto yy621;
 		}
 	}
-yy785:
-	yyaccept = 13;
+yy725:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy681;
-		if (yych <= '9') goto yy787;
-		if (yych <= 'm') goto yy681;
-		goto yy685;
+		if (yych <= '/') goto yy621;
+		if (yych <= '9') goto yy727;
+		if (yych <= 'm') goto yy621;
+		goto yy625;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy681;
-			goto yy686;
+			if (yych <= 'q') goto yy621;
+			goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
-			goto yy681;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
+			goto yy621;
 		}
 	}
-yy786:
-	yyaccept = 13;
+yy726:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy681;
-		if (yych <= '1') goto yy787;
-		if (yych <= 'm') goto yy681;
-		goto yy685;
+		if (yych <= '/') goto yy621;
+		if (yych <= '1') goto yy727;
+		if (yych <= 'm') goto yy621;
+		goto yy625;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy681;
-			goto yy686;
+			if (yych <= 'q') goto yy621;
+			goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
-			goto yy681;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
+			goto yy621;
 		}
 	}
-yy787:
-	yyaccept = 15;
+yy727:
+	yyaccept = 14;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'q') {
-		if (yych == 'n') goto yy685;
+		if (yych == 'n') goto yy625;
 	} else {
-		if (yych <= 'r') goto yy686;
-		if (yych <= 's') goto yy684;
-		if (yych <= 't') goto yy687;
+		if (yych <= 'r') goto yy626;
+		if (yych <= 's') goto yy624;
+		if (yych <= 't') goto yy627;
 	}
-yy788:
+yy728:
 #line 1298 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
@@ -12330,36 +11426,36 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 12334 "ext/date/lib/parse_date.c"
-yy789:
+#line 11430 "ext/date/lib/parse_date.c"
+yy729:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy790;
+	if (yych == 'C') goto yy730;
 	if (yych != 'c') goto yy56;
-yy790:
+yy730:
 	yych = *++YYCURSOR;
 	if (yych != '-') goto yy56;
-yy791:
+yy731:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy792;
-	if (yych <= '2') goto yy793;
-	if (yych <= '3') goto yy794;
+	if (yych <= '0') goto yy732;
+	if (yych <= '2') goto yy733;
+	if (yych <= '3') goto yy734;
 	goto yy56;
-yy792:
+yy732:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy795;
+	if (yych <= '9') goto yy735;
 	goto yy56;
-yy793:
+yy733:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy795;
+	if (yych <= '9') goto yy735;
 	goto yy56;
-yy794:
+yy734:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '2') goto yy56;
-yy795:
+yy735:
 	++YYCURSOR;
 #line 1539 "ext/date/lib/parse_date.re"
 	{
@@ -12374,119 +11470,119 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 12378 "ext/date/lib/parse_date.c"
-yy797:
+#line 11474 "ext/date/lib/parse_date.c"
+yy737:
 	yych = *++YYCURSOR;
-	if (yych == 'V') goto yy790;
-	if (yych == 'v') goto yy790;
+	if (yych == 'V') goto yy730;
+	if (yych == 'v') goto yy730;
 	goto yy56;
-yy798:
+yy738:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy790;
-	if (yych == 't') goto yy790;
+	if (yych == 'T') goto yy730;
+	if (yych == 't') goto yy730;
 	goto yy56;
-yy799:
+yy739:
 	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy800;
+	if (yych == 'P') goto yy740;
 	if (yych != 'p') goto yy56;
-yy800:
+yy740:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
-		if (yych == '-') goto yy791;
+		if (yych == '-') goto yy731;
 		goto yy56;
 	} else {
-		if (yych <= 'T') goto yy790;
-		if (yych == 't') goto yy790;
+		if (yych <= 'T') goto yy730;
+		if (yych == 't') goto yy730;
 		goto yy56;
 	}
-yy801:
+yy741:
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy790;
-	if (yych == 'g') goto yy790;
+	if (yych == 'G') goto yy730;
+	if (yych == 'g') goto yy730;
 	goto yy56;
-yy802:
+yy742:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy790;
-	if (yych == 'r') goto yy790;
+	if (yych == 'R') goto yy730;
+	if (yych == 'r') goto yy730;
 	goto yy56;
-yy803:
+yy743:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
-		if (yych == 'R') goto yy790;
+		if (yych == 'R') goto yy730;
 		if (yych <= 'X') goto yy56;
-		goto yy790;
+		goto yy730;
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy56;
-			goto yy790;
+			goto yy730;
 		} else {
-			if (yych == 'y') goto yy790;
+			if (yych == 'y') goto yy730;
 			goto yy56;
 		}
 	}
-yy804:
+yy744:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy790;
-	if (yych == 'b') goto yy790;
+	if (yych == 'B') goto yy730;
+	if (yych == 'b') goto yy730;
 	goto yy56;
-yy805:
+yy745:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'L') goto yy790;
+		if (yych == 'L') goto yy730;
 		if (yych <= 'M') goto yy56;
-		goto yy790;
+		goto yy730;
 	} else {
 		if (yych <= 'l') {
 			if (yych <= 'k') goto yy56;
-			goto yy790;
+			goto yy730;
 		} else {
-			if (yych == 'n') goto yy790;
+			if (yych == 'n') goto yy730;
 			goto yy56;
 		}
 	}
-yy806:
+yy746:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy790;
-	if (yych == 'n') goto yy790;
+	if (yych == 'N') goto yy730;
+	if (yych == 'n') goto yy730;
 	goto yy56;
-yy807:
-	yyaccept = 16;
+yy747:
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'O') {
 		if (yych <= '3') {
 			if (yych <= '-') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy815;
+					if (yych == '\t') goto yy755;
 				} else {
-					if (yych <= ' ') goto yy815;
-					if (yych >= '-') goto yy812;
+					if (yych <= ' ') goto yy755;
+					if (yych >= '-') goto yy752;
 				}
 			} else {
 				if (yych <= '0') {
-					if (yych <= '.') goto yy816;
-					if (yych <= '/') goto yy813;
-					goto yy829;
+					if (yych <= '.') goto yy756;
+					if (yych <= '/') goto yy753;
+					goto yy769;
 				} else {
-					if (yych <= '1') goto yy830;
-					if (yych <= '2') goto yy832;
-					goto yy833;
+					if (yych <= '1') goto yy770;
+					if (yych <= '2') goto yy772;
+					goto yy773;
 				}
 			}
 		} else {
 			if (yych <= 'D') {
 				if (yych <= '@') {
 					if (yych <= '9') goto yy54;
-					if (yych <= ':') goto yy831;
+					if (yych <= ':') goto yy771;
 				} else {
-					if (yych <= 'A') goto yy815;
-					if (yych >= 'D') goto yy815;
+					if (yych <= 'A') goto yy755;
+					if (yych >= 'D') goto yy755;
 				}
 			} else {
 				if (yych <= 'G') {
-					if (yych == 'F') goto yy815;
+					if (yych == 'F') goto yy755;
 				} else {
-					if (yych <= 'J') goto yy815;
-					if (yych >= 'M') goto yy815;
+					if (yych <= 'J') goto yy755;
+					if (yych >= 'M') goto yy755;
 				}
 			}
 		}
@@ -12494,39 +11590,39 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'h') {
 			if (yych <= 'a') {
 				if (yych <= 'W') {
-					if (yych <= 'R') goto yy808;
-					if (yych <= 'V') goto yy815;
-					goto yy834;
+					if (yych <= 'R') goto yy748;
+					if (yych <= 'V') goto yy755;
+					goto yy774;
 				} else {
-					if (yych <= 'Y') goto yy815;
-					if (yych >= 'a') goto yy815;
+					if (yych <= 'Y') goto yy755;
+					if (yych >= 'a') goto yy755;
 				}
 			} else {
 				if (yych <= 'e') {
-					if (yych == 'd') goto yy815;
+					if (yych == 'd') goto yy755;
 				} else {
-					if (yych != 'g') goto yy815;
+					if (yych != 'g') goto yy755;
 				}
 			}
 		} else {
 			if (yych <= 'u') {
 				if (yych <= 'l') {
-					if (yych == 'j') goto yy815;
+					if (yych == 'j') goto yy755;
 				} else {
-					if (yych <= 'o') goto yy815;
-					if (yych >= 's') goto yy815;
+					if (yych <= 'o') goto yy755;
+					if (yych >= 's') goto yy755;
 				}
 			} else {
 				if (yych <= 'x') {
-					if (yych == 'w') goto yy815;
+					if (yych == 'w') goto yy755;
 				} else {
-					if (yych <= 'y') goto yy815;
-					if (yych == 0xC2) goto yy815;
+					if (yych <= 'y') goto yy755;
+					if (yych == 0xC2) goto yy755;
 				}
 			}
 		}
 	}
-yy808:
+yy748:
 #line 1574 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("year4");
@@ -12535,12 +11631,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 12539 "ext/date/lib/parse_date.c"
-yy809:
+#line 11635 "ext/date/lib/parse_date.c"
+yy749:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '0':	goto yy810;
-	case '1':	goto yy811;
+	case '0':	goto yy750;
+	case '1':	goto yy751;
 	case '2':
 	case '3':
 	case '4':
@@ -12548,42 +11644,42 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy777;
+	case '9':	goto yy717;
 	case 'A':
-	case 'a':	goto yy770;
+	case 'a':	goto yy710;
 	case 'D':
-	case 'd':	goto yy774;
+	case 'd':	goto yy714;
 	case 'F':
-	case 'f':	goto yy768;
+	case 'f':	goto yy708;
 	case 'J':
-	case 'j':	goto yy767;
+	case 'j':	goto yy707;
 	case 'M':
-	case 'm':	goto yy769;
+	case 'm':	goto yy709;
 	case 'N':
-	case 'n':	goto yy773;
+	case 'n':	goto yy713;
 	case 'O':
-	case 'o':	goto yy772;
+	case 'o':	goto yy712;
 	case 'S':
-	case 's':	goto yy771;
+	case 's':	goto yy711;
 	default:	goto yy56;
 	}
-yy810:
+yy750:
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy778;
+	if (yych == '-') goto yy718;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy777;
+	if (yych <= '9') goto yy717;
 	goto yy56;
-yy811:
+yy751:
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy778;
+	if (yych == '-') goto yy718;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy777;
+	if (yych <= '2') goto yy717;
 	goto yy56;
-yy812:
+yy752:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '0':	goto yy997;
-	case '1':	goto yy999;
+	case '0':	goto yy937;
+	case '1':	goto yy939;
 	case '2':
 	case '3':
 	case '4':
@@ -12591,56 +11687,56 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy1000;
+	case '9':	goto yy940;
 	case 'A':
-	case 'a':	goto yy991;
+	case 'a':	goto yy931;
 	case 'D':
-	case 'd':	goto yy995;
+	case 'd':	goto yy935;
 	case 'F':
-	case 'f':	goto yy989;
+	case 'f':	goto yy929;
 	case 'J':
-	case 'j':	goto yy988;
+	case 'j':	goto yy928;
 	case 'M':
-	case 'm':	goto yy990;
+	case 'm':	goto yy930;
 	case 'N':
-	case 'n':	goto yy994;
+	case 'n':	goto yy934;
 	case 'O':
-	case 'o':	goto yy993;
+	case 'o':	goto yy933;
 	case 'S':
-	case 's':	goto yy992;
-	case 'W':	goto yy996;
-	default:	goto yy963;
+	case 's':	goto yy932;
+	case 'W':	goto yy936;
+	default:	goto yy903;
 	}
-yy813:
+yy753:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy971;
-	if (yych <= '1') goto yy972;
-	if (yych <= '9') goto yy973;
+	if (yych <= '0') goto yy911;
+	if (yych <= '1') goto yy912;
+	if (yych <= '9') goto yy913;
 	goto yy56;
-yy814:
+yy754:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
 	yych = *YYCURSOR;
-yy815:
+yy755:
 	if (yych <= 'W') {
 		if (yych <= 'G') {
 			if (yych <= '.') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy814;
+					if (yych == '\t') goto yy754;
 					goto yy56;
 				} else {
-					if (yych <= ' ') goto yy814;
+					if (yych <= ' ') goto yy754;
 					if (yych <= ',') goto yy56;
-					goto yy962;
+					goto yy902;
 				}
 			} else {
 				if (yych <= 'C') {
-					if (yych == 'A') goto yy824;
+					if (yych == 'A') goto yy764;
 					goto yy56;
 				} else {
-					if (yych <= 'D') goto yy828;
-					if (yych == 'F') goto yy822;
+					if (yych <= 'D') goto yy768;
+					if (yych == 'F') goto yy762;
 					goto yy56;
 				}
 			}
@@ -12648,22 +11744,22 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'N') {
 				if (yych <= 'J') {
 					if (yych <= 'H') goto yy65;
-					if (yych <= 'I') goto yy817;
-					goto yy821;
+					if (yych <= 'I') goto yy757;
+					goto yy761;
 				} else {
 					if (yych <= 'L') goto yy56;
-					if (yych <= 'M') goto yy823;
-					goto yy827;
+					if (yych <= 'M') goto yy763;
+					goto yy767;
 				}
 			} else {
 				if (yych <= 'S') {
-					if (yych <= 'O') goto yy826;
+					if (yych <= 'O') goto yy766;
 					if (yych <= 'R') goto yy56;
-					goto yy825;
+					goto yy765;
 				} else {
 					if (yych <= 'T') goto yy70;
 					if (yych <= 'U') goto yy63;
-					if (yych <= 'V') goto yy819;
+					if (yych <= 'V') goto yy759;
 					goto yy69;
 				}
 			}
@@ -12672,33 +11768,33 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych <= '`') {
-					if (yych <= 'X') goto yy820;
+					if (yych <= 'X') goto yy760;
 					if (yych <= 'Y') goto yy68;
 					goto yy56;
 				} else {
-					if (yych <= 'a') goto yy824;
+					if (yych <= 'a') goto yy764;
 					if (yych <= 'c') goto yy56;
-					goto yy828;
+					goto yy768;
 				}
 			} else {
 				if (yych <= 'g') {
-					if (yych == 'f') goto yy822;
+					if (yych == 'f') goto yy762;
 					goto yy56;
 				} else {
 					if (yych <= 'h') goto yy65;
-					if (yych == 'j') goto yy821;
+					if (yych == 'j') goto yy761;
 					goto yy56;
 				}
 			}
 		} else {
 			if (yych <= 'u') {
 				if (yych <= 'o') {
-					if (yych <= 'm') goto yy823;
-					if (yych <= 'n') goto yy827;
-					goto yy826;
+					if (yych <= 'm') goto yy763;
+					if (yych <= 'n') goto yy767;
+					goto yy766;
 				} else {
 					if (yych <= 'r') goto yy56;
-					if (yych <= 's') goto yy825;
+					if (yych <= 's') goto yy765;
 					if (yych <= 't') goto yy70;
 					goto yy63;
 				}
@@ -12714,22 +11810,22 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy816:
+yy756:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy963;
-	if (yych <= '0') goto yy955;
-	if (yych <= '2') goto yy956;
-	if (yych <= '3') goto yy957;
-	goto yy963;
-yy817:
+	if (yych <= '/') goto yy903;
+	if (yych <= '0') goto yy895;
+	if (yych <= '2') goto yy896;
+	if (yych <= '3') goto yy897;
+	goto yy903;
+yy757:
 	++YYCURSOR;
 	if ((yych = *YYCURSOR) <= 'U') {
-		if (yych == 'I') goto yy954;
+		if (yych == 'I') goto yy894;
 	} else {
-		if (yych == 'W') goto yy818;
-		if (yych <= 'X') goto yy908;
+		if (yych == 'W') goto yy758;
+		if (yych <= 'X') goto yy848;
 	}
-yy818:
+yy758:
 #line 1395 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
@@ -12743,35 +11839,35 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 12747 "ext/date/lib/parse_date.c"
-yy819:
+#line 11843 "ext/date/lib/parse_date.c"
+yy759:
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy952;
-	goto yy818;
-yy820:
+	if (yych == 'I') goto yy892;
+	goto yy758;
+yy760:
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy951;
-	goto yy818;
-yy821:
+	if (yych == 'I') goto yy891;
+	goto yy758;
+yy761:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'A') goto yy944;
+		if (yych == 'A') goto yy884;
 		if (yych <= 'T') goto yy56;
-		goto yy943;
+		goto yy883;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
-			goto yy944;
+			goto yy884;
 		} else {
-			if (yych == 'u') goto yy943;
+			if (yych == 'u') goto yy883;
 			goto yy56;
 		}
 	}
-yy822:
+yy762:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= 'N') {
-			if (yych == 'E') goto yy937;
+			if (yych == 'E') goto yy877;
 			goto yy56;
 		} else {
 			if (yych <= 'O') goto yy100;
@@ -12780,7 +11876,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= 'n') {
-			if (yych == 'e') goto yy937;
+			if (yych == 'e') goto yy877;
 			goto yy56;
 		} else {
 			if (yych <= 'o') goto yy100;
@@ -12788,11 +11884,11 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy56;
 		}
 	}
-yy823:
+yy763:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= 'I') {
-			if (yych == 'A') goto yy934;
+			if (yych == 'A') goto yy874;
 			if (yych <= 'H') goto yy56;
 			goto yy138;
 		} else {
@@ -12802,7 +11898,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= 'i') {
-			if (yych == 'a') goto yy934;
+			if (yych == 'a') goto yy874;
 			if (yych <= 'h') goto yy56;
 			goto yy138;
 		} else {
@@ -12815,29 +11911,29 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy824:
+yy764:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'P') goto yy928;
+		if (yych == 'P') goto yy868;
 		if (yych <= 'T') goto yy56;
-		goto yy927;
+		goto yy867;
 	} else {
 		if (yych <= 'p') {
 			if (yych <= 'o') goto yy56;
-			goto yy928;
+			goto yy868;
 		} else {
-			if (yych == 'u') goto yy927;
+			if (yych == 'u') goto yy867;
 			goto yy56;
 		}
 	}
-yy825:
+yy765:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych <= 'D') {
 			if (yych == 'A') goto yy119;
 			goto yy56;
 		} else {
-			if (yych <= 'E') goto yy920;
+			if (yych <= 'E') goto yy860;
 			if (yych <= 'T') goto yy56;
 			goto yy118;
 		}
@@ -12846,73 +11942,73 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych == 'a') goto yy119;
 			goto yy56;
 		} else {
-			if (yych <= 'e') goto yy920;
+			if (yych <= 'e') goto yy860;
 			if (yych == 'u') goto yy118;
 			goto yy56;
 		}
 	}
-yy826:
+yy766:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy915;
-	if (yych == 'c') goto yy915;
+	if (yych == 'C') goto yy855;
+	if (yych == 'c') goto yy855;
 	goto yy56;
-yy827:
+yy767:
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy909;
-	if (yych == 'o') goto yy909;
+	if (yych == 'O') goto yy849;
+	if (yych == 'o') goto yy849;
 	goto yy56;
-yy828:
+yy768:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych == 'A') goto yy115;
 		if (yych <= 'D') goto yy56;
-		goto yy902;
+		goto yy842;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
 			goto yy115;
 		} else {
-			if (yych == 'e') goto yy902;
+			if (yych == 'e') goto yy842;
 			goto yy56;
 		}
 	}
-yy829:
+yy769:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '0') goto yy899;
-	if (yych <= '9') goto yy900;
+	if (yych <= '0') goto yy839;
+	if (yych <= '9') goto yy840;
 	goto yy60;
-yy830:
+yy770:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '2') goto yy868;
-	if (yych <= '9') goto yy847;
+	if (yych <= '2') goto yy808;
+	if (yych <= '9') goto yy787;
 	goto yy60;
-yy831:
+yy771:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy848;
-	if (yych <= '1') goto yy849;
+	if (yych <= '0') goto yy788;
+	if (yych <= '1') goto yy789;
 	goto yy56;
-yy832:
+yy772:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '9') goto yy847;
+	if (yych <= '9') goto yy787;
 	goto yy60;
-yy833:
+yy773:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '5') goto yy843;
-	if (yych <= '6') goto yy844;
+	if (yych <= '5') goto yy783;
+	if (yych <= '6') goto yy784;
 	if (yych <= '9') goto yy54;
 	goto yy60;
-yy834:
+yy774:
 	yych = *++YYCURSOR;
 	if (yych <= '5') {
 		if (yych <= '/') goto yy56;
-		if (yych <= '0') goto yy835;
-		if (yych <= '4') goto yy836;
-		goto yy837;
+		if (yych <= '0') goto yy775;
+		if (yych <= '4') goto yy776;
+		goto yy777;
 	} else {
 		if (yych <= 'E') {
 			if (yych <= 'D') goto yy56;
@@ -12922,27 +12018,27 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy56;
 		}
 	}
-yy835:
+yy775:
 	yych = *++YYCURSOR;
 	if (yych <= '0') goto yy56;
-	if (yych <= '9') goto yy838;
+	if (yych <= '9') goto yy778;
 	goto yy56;
-yy836:
+yy776:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy838;
+	if (yych <= '9') goto yy778;
 	goto yy56;
-yy837:
+yy777:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '4') goto yy56;
-yy838:
-	yyaccept = 17;
+yy778:
+	yyaccept = 16;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy840;
-	if (yych <= '/') goto yy839;
-	if (yych <= '7') goto yy841;
-yy839:
+	if (yych == '-') goto yy780;
+	if (yych <= '/') goto yy779;
+	if (yych <= '7') goto yy781;
+yy779:
 #line 1506 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
@@ -12961,12 +12057,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 12965 "ext/date/lib/parse_date.c"
-yy840:
+#line 12061 "ext/date/lib/parse_date.c"
+yy780:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '8') goto yy56;
-yy841:
+yy781:
 	++YYCURSOR;
 #line 1487 "ext/date/lib/parse_date.re"
 	{
@@ -12986,20 +12082,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 12990 "ext/date/lib/parse_date.c"
-yy843:
+#line 12086 "ext/date/lib/parse_date.c"
+yy783:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '9') goto yy845;
+	if (yych <= '9') goto yy785;
 	goto yy60;
-yy844:
+yy784:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '6') goto yy845;
+	if (yych <= '6') goto yy785;
 	if (yych <= '9') goto yy54;
 	goto yy60;
-yy845:
-	yyaccept = 18;
+yy785:
+	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 2) {
 		goto yy54;
@@ -13040,7 +12136,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		} else {
 			if (yych <= 'w') {
-				if (yych <= 'r') goto yy846;
+				if (yych <= 'r') goto yy786;
 				if (yych != 'v') goto yy60;
 			} else {
 				if (yych <= 'y') {
@@ -13051,7 +12147,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy846:
+yy786:
 #line 1473 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
@@ -13065,62 +12161,62 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_YEARDAY;
 	}
-#line 13069 "ext/date/lib/parse_date.c"
-yy847:
+#line 12165 "ext/date/lib/parse_date.c"
+yy787:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '9') goto yy845;
+	if (yych <= '9') goto yy785;
 	goto yy60;
-yy848:
+yy788:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy850;
+	if (yych <= '9') goto yy790;
 	goto yy56;
-yy849:
+yy789:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '3') goto yy56;
-yy850:
+yy790:
 	yych = *++YYCURSOR;
 	if (yych != ':') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy852;
-	if (yych <= '2') goto yy853;
-	if (yych <= '3') goto yy854;
+	if (yych <= '0') goto yy792;
+	if (yych <= '2') goto yy793;
+	if (yych <= '3') goto yy794;
 	goto yy56;
-yy852:
+yy792:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy855;
+	if (yych <= '9') goto yy795;
 	goto yy56;
-yy853:
+yy793:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy855;
+	if (yych <= '9') goto yy795;
 	goto yy56;
-yy854:
+yy794:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '2') goto yy56;
-yy855:
+yy795:
 	yych = *++YYCURSOR;
 	if (yych != ' ') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy857;
-	if (yych <= '2') goto yy858;
+	if (yych <= '1') goto yy797;
+	if (yych <= '2') goto yy798;
 	goto yy56;
-yy857:
+yy797:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy859;
+	if (yych <= '9') goto yy799;
 	goto yy56;
-yy858:
+yy798:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '5') goto yy56;
-yy859:
+yy799:
 	yych = *++YYCURSOR;
 	if (yych != ':') goto yy56;
 	yych = *++YYCURSOR;
@@ -13133,20 +12229,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	if (yych != ':') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy864;
-	if (yych <= '6') goto yy865;
+	if (yych <= '5') goto yy804;
+	if (yych <= '6') goto yy805;
 	goto yy56;
-yy864:
+yy804:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy866;
+	if (yych <= '9') goto yy806;
 	goto yy56;
-yy865:
+yy805:
 	yych = *++YYCURSOR;
 	if (yych != '0') goto yy56;
-yy866:
+yy806:
 	++YYCURSOR;
-yy867:
+yy807:
 #line 1447 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
@@ -13172,46 +12268,46 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_XMLRPC_SOAP;
 	}
-#line 13176 "ext/date/lib/parse_date.c"
-yy868:
+#line 12272 "ext/date/lib/parse_date.c"
+yy808:
 	yych = *++YYCURSOR;
 	if (yych <= '2') {
 		if (yych <= '/') goto yy60;
-		if (yych >= '1') goto yy870;
+		if (yych >= '1') goto yy810;
 	} else {
-		if (yych <= '3') goto yy871;
-		if (yych <= '9') goto yy845;
+		if (yych <= '3') goto yy811;
+		if (yych <= '9') goto yy785;
 		goto yy60;
 	}
-yy869:
-	yyaccept = 18;
+yy809:
+	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'E') {
 			if (yych <= ' ') {
 				if (yych == '\t') goto yy60;
-				if (yych <= 0x1F) goto yy846;
+				if (yych <= 0x1F) goto yy786;
 				goto yy60;
 			} else {
 				if (yych <= '9') {
-					if (yych <= '/') goto yy846;
-					goto yy872;
+					if (yych <= '/') goto yy786;
+					goto yy812;
 				} else {
 					if (yych == 'D') goto yy60;
-					goto yy846;
+					goto yy786;
 				}
 			}
 		} else {
 			if (yych <= 'L') {
-				if (yych == 'G') goto yy846;
+				if (yych == 'G') goto yy786;
 				if (yych <= 'H') goto yy60;
-				goto yy846;
+				goto yy786;
 			} else {
 				if (yych <= 'R') {
 					if (yych <= 'M') goto yy60;
-					goto yy846;
+					goto yy786;
 				} else {
-					if (yych == 'V') goto yy846;
+					if (yych == 'V') goto yy786;
 					goto yy60;
 				}
 			}
@@ -13220,66 +12316,66 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych == 'Y') goto yy60;
-				if (yych <= 'c') goto yy846;
+				if (yych <= 'c') goto yy786;
 				goto yy60;
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy846;
+					if (yych <= 'e') goto yy786;
 					goto yy60;
 				} else {
 					if (yych == 'h') goto yy60;
-					goto yy846;
+					goto yy786;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy60;
-					goto yy846;
+					goto yy786;
 				} else {
-					if (yych == 'v') goto yy846;
+					if (yych == 'v') goto yy786;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy846;
+					if (yych <= 'x') goto yy786;
 					goto yy60;
 				} else {
 					if (yych == 0xC2) goto yy60;
-					goto yy846;
+					goto yy786;
 				}
 			}
 		}
 	}
-yy870:
-	yyaccept = 18;
+yy810:
+	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'E') {
 			if (yych <= ' ') {
 				if (yych == '\t') goto yy60;
-				if (yych <= 0x1F) goto yy846;
+				if (yych <= 0x1F) goto yy786;
 				goto yy60;
 			} else {
 				if (yych <= '9') {
-					if (yych <= '/') goto yy846;
-					goto yy872;
+					if (yych <= '/') goto yy786;
+					goto yy812;
 				} else {
 					if (yych == 'D') goto yy60;
-					goto yy846;
+					goto yy786;
 				}
 			}
 		} else {
 			if (yych <= 'L') {
-				if (yych == 'G') goto yy846;
+				if (yych == 'G') goto yy786;
 				if (yych <= 'H') goto yy60;
-				goto yy846;
+				goto yy786;
 			} else {
 				if (yych <= 'R') {
 					if (yych <= 'M') goto yy60;
-					goto yy846;
+					goto yy786;
 				} else {
-					if (yych == 'V') goto yy846;
+					if (yych == 'V') goto yy786;
 					goto yy60;
 				}
 			}
@@ -13288,70 +12384,70 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych == 'Y') goto yy60;
-				if (yych <= 'c') goto yy846;
+				if (yych <= 'c') goto yy786;
 				goto yy60;
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy846;
+					if (yych <= 'e') goto yy786;
 					goto yy60;
 				} else {
 					if (yych == 'h') goto yy60;
-					goto yy846;
+					goto yy786;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy60;
-					goto yy846;
+					goto yy786;
 				} else {
-					if (yych == 'v') goto yy846;
+					if (yych == 'v') goto yy786;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy846;
+					if (yych <= 'x') goto yy786;
 					goto yy60;
 				} else {
 					if (yych == 0xC2) goto yy60;
-					goto yy846;
+					goto yy786;
 				}
 			}
 		}
 	}
-yy871:
-	yyaccept = 18;
+yy811:
+	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'D') {
 			if (yych <= ' ') {
 				if (yych == '\t') goto yy60;
-				if (yych <= 0x1F) goto yy846;
+				if (yych <= 0x1F) goto yy786;
 				goto yy60;
 			} else {
 				if (yych <= '1') {
-					if (yych <= '/') goto yy846;
+					if (yych <= '/') goto yy786;
 				} else {
 					if (yych <= '9') goto yy54;
-					if (yych <= 'C') goto yy846;
+					if (yych <= 'C') goto yy786;
 					goto yy60;
 				}
 			}
 		} else {
 			if (yych <= 'L') {
 				if (yych <= 'F') {
-					if (yych <= 'E') goto yy846;
+					if (yych <= 'E') goto yy786;
 					goto yy60;
 				} else {
 					if (yych == 'H') goto yy60;
-					goto yy846;
+					goto yy786;
 				}
 			} else {
 				if (yych <= 'R') {
 					if (yych <= 'M') goto yy60;
-					goto yy846;
+					goto yy786;
 				} else {
-					if (yych == 'V') goto yy846;
+					if (yych == 'V') goto yy786;
 					goto yy60;
 				}
 			}
@@ -13360,39 +12456,39 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych == 'Y') goto yy60;
-				if (yych <= 'c') goto yy846;
+				if (yych <= 'c') goto yy786;
 				goto yy60;
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy846;
+					if (yych <= 'e') goto yy786;
 					goto yy60;
 				} else {
 					if (yych == 'h') goto yy60;
-					goto yy846;
+					goto yy786;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy60;
-					goto yy846;
+					goto yy786;
 				} else {
-					if (yych == 'v') goto yy846;
+					if (yych == 'v') goto yy786;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy846;
+					if (yych <= 'x') goto yy786;
 					goto yy60;
 				} else {
 					if (yych == 0xC2) goto yy60;
-					goto yy846;
+					goto yy786;
 				}
 			}
 		}
 	}
-yy872:
-	yyaccept = 19;
+yy812:
+	yyaccept = 18;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 2) {
 		goto yy54;
@@ -13419,7 +12515,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				}
 			} else {
 				if (yych <= 'U') {
-					if (yych <= 'T') goto yy874;
+					if (yych <= 'T') goto yy814;
 					goto yy63;
 				} else {
 					if (yych == 'W') goto yy69;
@@ -13446,7 +12542,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'w') {
 				if (yych <= 't') {
 					if (yych <= 's') goto yy64;
-					goto yy875;
+					goto yy815;
 				} else {
 					if (yych <= 'u') goto yy63;
 					if (yych >= 'w') goto yy69;
@@ -13460,7 +12556,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy873:
+yy813:
 #line 1435 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenocolon");
@@ -13472,16 +12568,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NOCOLON;
 	}
-#line 13476 "ext/date/lib/parse_date.c"
-yy874:
+#line 12572 "ext/date/lib/parse_date.c"
+yy814:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= '2') {
 			if (yych <= '/') goto yy56;
-			if (yych <= '1') goto yy889;
-			goto yy890;
+			if (yych <= '1') goto yy829;
+			goto yy830;
 		} else {
-			if (yych <= '9') goto yy891;
+			if (yych <= '9') goto yy831;
 			if (yych <= 'G') goto yy56;
 			goto yy71;
 		}
@@ -13495,14 +12591,14 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy56;
 		}
 	}
-yy875:
+yy815:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= '2') {
 			if (yych <= '/') goto yy56;
-			if (yych >= '2') goto yy877;
+			if (yych >= '2') goto yy817;
 		} else {
-			if (yych <= '9') goto yy878;
+			if (yych <= '9') goto yy818;
 			if (yych <= 'G') goto yy56;
 			goto yy71;
 		}
@@ -13518,97 +12614,97 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	}
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy883;
-	if (yych <= '9') goto yy878;
+	if (yych <= '5') goto yy823;
+	if (yych <= '9') goto yy818;
 	goto yy56;
-yy877:
+yy817:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '4') goto yy883;
-	if (yych <= '5') goto yy879;
+	if (yych <= '4') goto yy823;
+	if (yych <= '5') goto yy819;
 	goto yy56;
-yy878:
+yy818:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '6') goto yy56;
-yy879:
+yy819:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
-yy880:
+yy820:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy881;
-	if (yych <= '6') goto yy882;
+	if (yych <= '5') goto yy821;
+	if (yych <= '6') goto yy822;
 	goto yy56;
-yy881:
+yy821:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy866;
+	if (yych <= '9') goto yy806;
 	goto yy56;
-yy882:
+yy822:
 	yych = *++YYCURSOR;
-	if (yych == '0') goto yy866;
+	if (yych == '0') goto yy806;
 	goto yy56;
-yy883:
+yy823:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy884;
-	if (yych <= '9') goto yy880;
+	if (yych <= '5') goto yy824;
+	if (yych <= '9') goto yy820;
 	goto yy56;
-yy884:
+yy824:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy885;
-	if (yych <= '6') goto yy886;
-	if (yych <= '9') goto yy880;
+	if (yych <= '5') goto yy825;
+	if (yych <= '6') goto yy826;
+	if (yych <= '9') goto yy820;
 	goto yy56;
-yy885:
+yy825:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy887;
-	if (yych <= '6') goto yy888;
-	if (yych <= '9') goto yy866;
+	if (yych <= '5') goto yy827;
+	if (yych <= '6') goto yy828;
+	if (yych <= '9') goto yy806;
 	goto yy56;
-yy886:
+yy826:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy887;
-	if (yych <= '5') goto yy881;
-	if (yych <= '6') goto yy882;
+	if (yych <= '0') goto yy827;
+	if (yych <= '5') goto yy821;
+	if (yych <= '6') goto yy822;
 	goto yy56;
-yy887:
+yy827:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy867;
-	if (yych <= '9') goto yy866;
-	goto yy867;
-yy888:
+	if (yych <= '/') goto yy807;
+	if (yych <= '9') goto yy806;
+	goto yy807;
+yy828:
 	yych = *++YYCURSOR;
-	if (yych == '0') goto yy866;
-	goto yy867;
-yy889:
+	if (yych == '0') goto yy806;
+	goto yy807;
+yy829:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy898;
-	if (yych <= '9') goto yy891;
-	if (yych <= ':') goto yy892;
+	if (yych <= '5') goto yy838;
+	if (yych <= '9') goto yy831;
+	if (yych <= ':') goto yy832;
 	goto yy56;
-yy890:
+yy830:
 	yych = *++YYCURSOR;
 	if (yych <= '5') {
 		if (yych <= '/') goto yy56;
-		if (yych <= '4') goto yy898;
-		goto yy879;
+		if (yych <= '4') goto yy838;
+		goto yy819;
 	} else {
-		if (yych == ':') goto yy892;
+		if (yych == ':') goto yy832;
 		goto yy56;
 	}
-yy891:
+yy831:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy879;
+	if (yych <= '5') goto yy819;
 	if (yych != ':') goto yy56;
-yy892:
+yy832:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '6') goto yy56;
@@ -13619,129 +12715,129 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	if (yych != ':') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy896;
-	if (yych <= '6') goto yy897;
+	if (yych <= '5') goto yy836;
+	if (yych <= '6') goto yy837;
 	goto yy56;
-yy896:
+yy836:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy866;
+	if (yych <= '9') goto yy806;
 	goto yy56;
-yy897:
+yy837:
 	yych = *++YYCURSOR;
-	if (yych == '0') goto yy866;
+	if (yych == '0') goto yy806;
 	goto yy56;
-yy898:
+yy838:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy884;
-	if (yych <= '9') goto yy880;
-	if (yych <= ':') goto yy892;
+	if (yych <= '5') goto yy824;
+	if (yych <= '9') goto yy820;
+	if (yych <= ':') goto yy832;
 	goto yy56;
-yy899:
+yy839:
 	yych = *++YYCURSOR;
 	if (yych <= '2') {
 		if (yych <= '/') goto yy60;
-		if (yych <= '0') goto yy901;
-		goto yy870;
+		if (yych <= '0') goto yy841;
+		goto yy810;
 	} else {
-		if (yych <= '3') goto yy871;
-		if (yych <= '9') goto yy845;
+		if (yych <= '3') goto yy811;
+		if (yych <= '9') goto yy785;
 		goto yy60;
 	}
-yy900:
+yy840:
 	yych = *++YYCURSOR;
 	if (yych <= '2') {
 		if (yych <= '/') goto yy60;
-		if (yych <= '0') goto yy869;
-		goto yy870;
+		if (yych <= '0') goto yy809;
+		goto yy810;
 	} else {
-		if (yych <= '3') goto yy871;
-		if (yych <= '9') goto yy845;
+		if (yych <= '3') goto yy811;
+		if (yych <= '9') goto yy785;
 		goto yy60;
 	}
-yy901:
+yy841:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '9') goto yy872;
+	if (yych <= '9') goto yy812;
 	goto yy60;
-yy902:
+yy842:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy903;
+	if (yych == 'C') goto yy843;
 	if (yych != 'c') goto yy56;
-yy903:
-	yyaccept = 20;
+yy843:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy904;
-	if (yych != 'e') goto yy818;
-yy904:
+	if (yych == 'E') goto yy844;
+	if (yych != 'e') goto yy758;
+yy844:
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy905;
+	if (yych == 'M') goto yy845;
 	if (yych != 'm') goto yy56;
-yy905:
+yy845:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy906;
+	if (yych == 'B') goto yy846;
 	if (yych != 'b') goto yy56;
-yy906:
+yy846:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy907;
+	if (yych == 'E') goto yy847;
 	if (yych != 'e') goto yy56;
-yy907:
+yy847:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy908;
+	if (yych == 'R') goto yy848;
 	if (yych != 'r') goto yy56;
-yy908:
+yy848:
 	yych = *++YYCURSOR;
-	goto yy818;
-yy909:
+	goto yy758;
+yy849:
 	yych = *++YYCURSOR;
-	if (yych == 'V') goto yy910;
+	if (yych == 'V') goto yy850;
 	if (yych != 'v') goto yy56;
-yy910:
-	yyaccept = 20;
+yy850:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy911;
-	if (yych != 'e') goto yy818;
-yy911:
+	if (yych == 'E') goto yy851;
+	if (yych != 'e') goto yy758;
+yy851:
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy912;
+	if (yych == 'M') goto yy852;
 	if (yych != 'm') goto yy56;
-yy912:
+yy852:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy913;
+	if (yych == 'B') goto yy853;
 	if (yych != 'b') goto yy56;
-yy913:
+yy853:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy914;
+	if (yych == 'E') goto yy854;
 	if (yych != 'e') goto yy56;
-yy914:
+yy854:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy908;
-	if (yych == 'r') goto yy908;
+	if (yych == 'R') goto yy848;
+	if (yych == 'r') goto yy848;
 	goto yy56;
-yy915:
+yy855:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy916;
+	if (yych == 'T') goto yy856;
 	if (yych != 't') goto yy56;
-yy916:
-	yyaccept = 20;
+yy856:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy917;
-	if (yych != 'o') goto yy818;
-yy917:
+	if (yych == 'O') goto yy857;
+	if (yych != 'o') goto yy758;
+yy857:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy918;
+	if (yych == 'B') goto yy858;
 	if (yych != 'b') goto yy56;
-yy918:
+yy858:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy919;
+	if (yych == 'E') goto yy859;
 	if (yych != 'e') goto yy56;
-yy919:
+yy859:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy908;
-	if (yych == 'r') goto yy908;
+	if (yych == 'R') goto yy848;
+	if (yych == 'r') goto yy848;
 	goto yy56;
-yy920:
+yy860:
 	yych = *++YYCURSOR;
 	if (yych <= 'P') {
 		if (yych == 'C') goto yy121;
@@ -13754,518 +12850,518 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych != 'p') goto yy56;
 		}
 	}
-yy921:
+yy861:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy922;
-	if (yych != 't') goto yy818;
-yy922:
-	yyaccept = 20;
+	if (yych == 'T') goto yy862;
+	if (yych != 't') goto yy758;
+yy862:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy923;
-	if (yych != 'e') goto yy818;
-yy923:
+	if (yych == 'E') goto yy863;
+	if (yych != 'e') goto yy758;
+yy863:
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy924;
+	if (yych == 'M') goto yy864;
 	if (yych != 'm') goto yy56;
-yy924:
+yy864:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy925;
+	if (yych == 'B') goto yy865;
 	if (yych != 'b') goto yy56;
-yy925:
+yy865:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy926;
+	if (yych == 'E') goto yy866;
 	if (yych != 'e') goto yy56;
-yy926:
+yy866:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy908;
-	if (yych == 'r') goto yy908;
+	if (yych == 'R') goto yy848;
+	if (yych == 'r') goto yy848;
 	goto yy56;
-yy927:
+yy867:
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy931;
-	if (yych == 'g') goto yy931;
+	if (yych == 'G') goto yy871;
+	if (yych == 'g') goto yy871;
 	goto yy56;
-yy928:
+yy868:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy929;
+	if (yych == 'R') goto yy869;
 	if (yych != 'r') goto yy56;
-yy929:
-	yyaccept = 20;
+yy869:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy930;
-	if (yych != 'i') goto yy818;
-yy930:
+	if (yych == 'I') goto yy870;
+	if (yych != 'i') goto yy758;
+yy870:
 	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy908;
-	if (yych == 'l') goto yy908;
+	if (yych == 'L') goto yy848;
+	if (yych == 'l') goto yy848;
 	goto yy56;
-yy931:
-	yyaccept = 20;
+yy871:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy932;
-	if (yych != 'u') goto yy818;
-yy932:
+	if (yych == 'U') goto yy872;
+	if (yych != 'u') goto yy758;
+yy872:
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy933;
+	if (yych == 'S') goto yy873;
 	if (yych != 's') goto yy56;
-yy933:
+yy873:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy908;
-	if (yych == 't') goto yy908;
+	if (yych == 'T') goto yy848;
+	if (yych == 't') goto yy848;
 	goto yy56;
-yy934:
+yy874:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
-		if (yych == 'R') goto yy935;
+		if (yych == 'R') goto yy875;
 		if (yych <= 'X') goto yy56;
-		goto yy908;
+		goto yy848;
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy56;
 		} else {
-			if (yych == 'y') goto yy908;
+			if (yych == 'y') goto yy848;
 			goto yy56;
 		}
 	}
-yy935:
-	yyaccept = 20;
+yy875:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy936;
-	if (yych != 'c') goto yy818;
-yy936:
+	if (yych == 'C') goto yy876;
+	if (yych != 'c') goto yy758;
+yy876:
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy908;
-	if (yych == 'h') goto yy908;
+	if (yych == 'H') goto yy848;
+	if (yych == 'h') goto yy848;
 	goto yy56;
-yy937:
+yy877:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy938;
+	if (yych == 'B') goto yy878;
 	if (yych != 'b') goto yy56;
-yy938:
-	yyaccept = 20;
+yy878:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy939;
-	if (yych != 'r') goto yy818;
-yy939:
+	if (yych == 'R') goto yy879;
+	if (yych != 'r') goto yy758;
+yy879:
 	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy940;
+	if (yych == 'U') goto yy880;
 	if (yych != 'u') goto yy56;
-yy940:
+yy880:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy941;
+	if (yych == 'A') goto yy881;
 	if (yych != 'a') goto yy56;
-yy941:
+yy881:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy942;
+	if (yych == 'R') goto yy882;
 	if (yych != 'r') goto yy56;
-yy942:
+yy882:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy908;
-	if (yych == 'y') goto yy908;
+	if (yych == 'Y') goto yy848;
+	if (yych == 'y') goto yy848;
 	goto yy56;
-yy943:
+yy883:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'L') goto yy950;
+		if (yych == 'L') goto yy890;
 		if (yych <= 'M') goto yy56;
-		goto yy949;
+		goto yy889;
 	} else {
 		if (yych <= 'l') {
 			if (yych <= 'k') goto yy56;
-			goto yy950;
+			goto yy890;
 		} else {
-			if (yych == 'n') goto yy949;
+			if (yych == 'n') goto yy889;
 			goto yy56;
 		}
 	}
-yy944:
+yy884:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy945;
+	if (yych == 'N') goto yy885;
 	if (yych != 'n') goto yy56;
-yy945:
-	yyaccept = 20;
+yy885:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy946;
-	if (yych != 'u') goto yy818;
-yy946:
+	if (yych == 'U') goto yy886;
+	if (yych != 'u') goto yy758;
+yy886:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy947;
+	if (yych == 'A') goto yy887;
 	if (yych != 'a') goto yy56;
-yy947:
+yy887:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy948;
+	if (yych == 'R') goto yy888;
 	if (yych != 'r') goto yy56;
-yy948:
+yy888:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy908;
-	if (yych == 'y') goto yy908;
+	if (yych == 'Y') goto yy848;
+	if (yych == 'y') goto yy848;
 	goto yy56;
-yy949:
+yy889:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy908;
-	if (yych == 'e') goto yy908;
-	goto yy818;
-yy950:
+	if (yych == 'E') goto yy848;
+	if (yych == 'e') goto yy848;
+	goto yy758;
+yy890:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy908;
-	if (yych == 'y') goto yy908;
-	goto yy818;
-yy951:
+	if (yych == 'Y') goto yy848;
+	if (yych == 'y') goto yy848;
+	goto yy758;
+yy891:
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy908;
-	goto yy818;
-yy952:
+	if (yych == 'I') goto yy848;
+	goto yy758;
+yy892:
 	yych = *++YYCURSOR;
-	if (yych != 'I') goto yy818;
+	if (yych != 'I') goto yy758;
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy908;
-	goto yy818;
-yy954:
+	if (yych == 'I') goto yy848;
+	goto yy758;
+yy894:
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy908;
-	goto yy818;
-yy955:
+	if (yych == 'I') goto yy848;
+	goto yy758;
+yy895:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy970;
-	if (yych <= '9') goto yy969;
+	if (yych <= '0') goto yy910;
+	if (yych <= '9') goto yy909;
 	goto yy56;
-yy956:
+yy896:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy968;
+	if (yych <= '9') goto yy908;
 	goto yy56;
-yy957:
+yy897:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy966;
-	if (yych <= '6') goto yy965;
+	if (yych <= '5') goto yy906;
+	if (yych <= '6') goto yy905;
 	goto yy56;
-yy958:
+yy898:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy937;
-	if (yych == 'e') goto yy937;
+	if (yych == 'E') goto yy877;
+	if (yych == 'e') goto yy877;
 	goto yy56;
-yy959:
+yy899:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy934;
-	if (yych == 'a') goto yy934;
+	if (yych == 'A') goto yy874;
+	if (yych == 'a') goto yy874;
 	goto yy56;
-yy960:
+yy900:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy964;
-	if (yych == 'e') goto yy964;
+	if (yych == 'E') goto yy904;
+	if (yych == 'e') goto yy904;
 	goto yy56;
-yy961:
+yy901:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy902;
-	if (yych == 'e') goto yy902;
+	if (yych == 'E') goto yy842;
+	if (yych == 'e') goto yy842;
 	goto yy56;
-yy962:
+yy902:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
 	yych = *YYCURSOR;
-yy963:
+yy903:
 	switch (yych) {
 	case '\t':
 	case ' ':
 	case '-':
-	case '.':	goto yy962;
+	case '.':	goto yy902;
 	case 'A':
-	case 'a':	goto yy824;
+	case 'a':	goto yy764;
 	case 'D':
-	case 'd':	goto yy961;
+	case 'd':	goto yy901;
 	case 'F':
-	case 'f':	goto yy958;
-	case 'I':	goto yy817;
+	case 'f':	goto yy898;
+	case 'I':	goto yy757;
 	case 'J':
-	case 'j':	goto yy821;
+	case 'j':	goto yy761;
 	case 'M':
-	case 'm':	goto yy959;
+	case 'm':	goto yy899;
 	case 'N':
-	case 'n':	goto yy827;
+	case 'n':	goto yy767;
 	case 'O':
-	case 'o':	goto yy826;
+	case 'o':	goto yy766;
 	case 'S':
-	case 's':	goto yy960;
-	case 'V':	goto yy819;
-	case 'X':	goto yy820;
+	case 's':	goto yy900;
+	case 'V':	goto yy759;
+	case 'X':	goto yy760;
 	default:	goto yy56;
 	}
-yy964:
+yy904:
 	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy921;
-	if (yych == 'p') goto yy921;
+	if (yych == 'P') goto yy861;
+	if (yych == 'p') goto yy861;
 	goto yy56;
-yy965:
+yy905:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '6') goto yy967;
+	if (yych <= '6') goto yy907;
 	goto yy56;
-yy966:
+yy906:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
-yy967:
+yy907:
 	yych = *++YYCURSOR;
-	goto yy846;
-yy968:
+	goto yy786;
+yy908:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy967;
+	if (yych <= '9') goto yy907;
 	goto yy56;
-yy969:
+yy909:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy967;
+	if (yych <= '9') goto yy907;
 	goto yy56;
-yy970:
+yy910:
 	yych = *++YYCURSOR;
 	if (yych <= '0') goto yy56;
-	if (yych <= '9') goto yy967;
+	if (yych <= '9') goto yy907;
 	goto yy56;
-yy971:
+yy911:
 	yych = *++YYCURSOR;
 	if (yych <= '.') goto yy56;
-	if (yych <= '/') goto yy974;
-	if (yych <= '9') goto yy982;
+	if (yych <= '/') goto yy914;
+	if (yych <= '9') goto yy922;
 	goto yy56;
-yy972:
+yy912:
 	yych = *++YYCURSOR;
 	if (yych <= '.') goto yy56;
-	if (yych <= '/') goto yy974;
-	if (yych <= '2') goto yy982;
+	if (yych <= '/') goto yy914;
+	if (yych <= '2') goto yy922;
 	goto yy56;
-yy973:
+yy913:
 	yych = *++YYCURSOR;
 	if (yych != '/') goto yy56;
-yy974:
+yy914:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy975;
-	if (yych <= '3') goto yy976;
-	if (yych <= '9') goto yy977;
+	if (yych <= '2') goto yy915;
+	if (yych <= '3') goto yy916;
+	if (yych <= '9') goto yy917;
 	goto yy56;
-yy975:
-	yyaccept = 21;
+yy915:
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy479;
-		if (yych <= '9') goto yy977;
-		if (yych <= 'm') goto yy479;
-		goto yy979;
+		if (yych <= '/') goto yy419;
+		if (yych <= '9') goto yy917;
+		if (yych <= 'm') goto yy419;
+		goto yy919;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy479;
-			goto yy980;
+			if (yych <= 'q') goto yy419;
+			goto yy920;
 		} else {
-			if (yych <= 's') goto yy978;
-			if (yych <= 't') goto yy981;
-			goto yy479;
+			if (yych <= 's') goto yy918;
+			if (yych <= 't') goto yy921;
+			goto yy419;
 		}
 	}
-yy976:
-	yyaccept = 21;
+yy916:
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy479;
-		if (yych <= '1') goto yy977;
-		if (yych <= 'm') goto yy479;
-		goto yy979;
+		if (yych <= '/') goto yy419;
+		if (yych <= '1') goto yy917;
+		if (yych <= 'm') goto yy419;
+		goto yy919;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy479;
-			goto yy980;
+			if (yych <= 'q') goto yy419;
+			goto yy920;
 		} else {
-			if (yych <= 's') goto yy978;
-			if (yych <= 't') goto yy981;
-			goto yy479;
+			if (yych <= 's') goto yy918;
+			if (yych <= 't') goto yy921;
+			goto yy419;
 		}
 	}
-yy977:
-	yyaccept = 21;
+yy917:
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'q') {
-		if (yych == 'n') goto yy979;
-		goto yy479;
+		if (yych == 'n') goto yy919;
+		goto yy419;
 	} else {
-		if (yych <= 'r') goto yy980;
-		if (yych <= 's') goto yy978;
-		if (yych <= 't') goto yy981;
-		goto yy479;
+		if (yych <= 'r') goto yy920;
+		if (yych <= 's') goto yy918;
+		if (yych <= 't') goto yy921;
+		goto yy419;
 	}
-yy978:
+yy918:
 	yych = *++YYCURSOR;
-	if (yych == 't') goto yy478;
+	if (yych == 't') goto yy418;
 	goto yy56;
-yy979:
+yy919:
 	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy478;
+	if (yych == 'd') goto yy418;
 	goto yy56;
-yy980:
+yy920:
 	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy478;
+	if (yych == 'd') goto yy418;
 	goto yy56;
-yy981:
+yy921:
 	yych = *++YYCURSOR;
-	if (yych == 'h') goto yy478;
+	if (yych == 'h') goto yy418;
 	goto yy56;
-yy982:
+yy922:
 	yych = *++YYCURSOR;
 	if (yych != '/') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '2') {
 		if (yych <= '/') goto yy56;
-		if (yych >= '1') goto yy985;
+		if (yych >= '1') goto yy925;
 	} else {
-		if (yych <= '3') goto yy986;
-		if (yych <= '9') goto yy977;
+		if (yych <= '3') goto yy926;
+		if (yych <= '9') goto yy917;
 		goto yy56;
 	}
-	yyaccept = 21;
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy479;
-		if (yych <= '9') goto yy987;
-		if (yych <= 'm') goto yy479;
-		goto yy979;
+		if (yych <= '/') goto yy419;
+		if (yych <= '9') goto yy927;
+		if (yych <= 'm') goto yy419;
+		goto yy919;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy479;
-			goto yy980;
+			if (yych <= 'q') goto yy419;
+			goto yy920;
 		} else {
-			if (yych <= 's') goto yy978;
-			if (yych <= 't') goto yy981;
-			goto yy479;
+			if (yych <= 's') goto yy918;
+			if (yych <= 't') goto yy921;
+			goto yy419;
 		}
 	}
-yy985:
-	yyaccept = 21;
+yy925:
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy479;
-		if (yych <= '9') goto yy987;
-		if (yych <= 'm') goto yy479;
-		goto yy979;
+		if (yych <= '/') goto yy419;
+		if (yych <= '9') goto yy927;
+		if (yych <= 'm') goto yy419;
+		goto yy919;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy479;
-			goto yy980;
+			if (yych <= 'q') goto yy419;
+			goto yy920;
 		} else {
-			if (yych <= 's') goto yy978;
-			if (yych <= 't') goto yy981;
-			goto yy479;
+			if (yych <= 's') goto yy918;
+			if (yych <= 't') goto yy921;
+			goto yy419;
 		}
 	}
-yy986:
-	yyaccept = 21;
+yy926:
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy479;
-		if (yych <= '1') goto yy987;
-		if (yych <= 'm') goto yy479;
-		goto yy979;
+		if (yych <= '/') goto yy419;
+		if (yych <= '1') goto yy927;
+		if (yych <= 'm') goto yy419;
+		goto yy919;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy479;
-			goto yy980;
+			if (yych <= 'q') goto yy419;
+			goto yy920;
 		} else {
-			if (yych <= 's') goto yy978;
-			if (yych <= 't') goto yy981;
-			goto yy479;
+			if (yych <= 's') goto yy918;
+			if (yych <= 't') goto yy921;
+			goto yy419;
 		}
 	}
-yy987:
-	yyaccept = 21;
+yy927:
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych == '/') goto yy478;
-		if (yych <= 'm') goto yy479;
-		goto yy979;
+		if (yych == '/') goto yy418;
+		if (yych <= 'm') goto yy419;
+		goto yy919;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy479;
-			goto yy980;
+			if (yych <= 'q') goto yy419;
+			goto yy920;
 		} else {
-			if (yych <= 's') goto yy978;
-			if (yych <= 't') goto yy981;
-			goto yy479;
+			if (yych <= 's') goto yy918;
+			if (yych <= 't') goto yy921;
+			goto yy419;
 		}
 	}
-yy988:
+yy928:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'A') goto yy1068;
+		if (yych == 'A') goto yy1008;
 		if (yych <= 'T') goto yy56;
-		goto yy1067;
+		goto yy1007;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
-			goto yy1068;
+			goto yy1008;
 		} else {
-			if (yych == 'u') goto yy1067;
+			if (yych == 'u') goto yy1007;
 			goto yy56;
 		}
 	}
-yy989:
+yy929:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1065;
-	if (yych == 'e') goto yy1065;
+	if (yych == 'E') goto yy1005;
+	if (yych == 'e') goto yy1005;
 	goto yy56;
-yy990:
+yy930:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1062;
-	if (yych == 'a') goto yy1062;
+	if (yych == 'A') goto yy1002;
+	if (yych == 'a') goto yy1002;
 	goto yy56;
-yy991:
+yy931:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'P') goto yy1059;
+		if (yych == 'P') goto yy999;
 		if (yych <= 'T') goto yy56;
-		goto yy1058;
+		goto yy998;
 	} else {
 		if (yych <= 'p') {
 			if (yych <= 'o') goto yy56;
-			goto yy1059;
+			goto yy999;
 		} else {
-			if (yych == 'u') goto yy1058;
+			if (yych == 'u') goto yy998;
 			goto yy56;
 		}
 	}
-yy992:
+yy932:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1055;
-	if (yych == 'e') goto yy1055;
+	if (yych == 'E') goto yy995;
+	if (yych == 'e') goto yy995;
 	goto yy56;
-yy993:
+yy933:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy1053;
-	if (yych == 'c') goto yy1053;
+	if (yych == 'C') goto yy993;
+	if (yych == 'c') goto yy993;
 	goto yy56;
-yy994:
+yy934:
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy1051;
-	if (yych == 'o') goto yy1051;
+	if (yych == 'O') goto yy991;
+	if (yych == 'o') goto yy991;
 	goto yy56;
-yy995:
+yy935:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1049;
-	if (yych == 'e') goto yy1049;
+	if (yych == 'E') goto yy989;
+	if (yych == 'e') goto yy989;
 	goto yy56;
-yy996:
+yy936:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy835;
-	if (yych <= '4') goto yy836;
-	if (yych <= '5') goto yy837;
+	if (yych <= '0') goto yy775;
+	if (yych <= '4') goto yy776;
+	if (yych <= '5') goto yy777;
 	goto yy56;
-yy997:
-	yyaccept = 22;
+yy937:
+	yyaccept = 21;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy1001;
-	if (yych <= '/') goto yy998;
-	if (yych <= '9') goto yy1020;
-yy998:
+	if (yych == '-') goto yy941;
+	if (yych <= '/') goto yy938;
+	if (yych <= '9') goto yy960;
+yy938:
 #line 1312 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
@@ -14279,639 +13375,639 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 14283 "ext/date/lib/parse_date.c"
-yy999:
-	yyaccept = 22;
+#line 13379 "ext/date/lib/parse_date.c"
+yy939:
+	yyaccept = 21;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy1001;
-	if (yych <= '/') goto yy998;
-	if (yych <= '2') goto yy1020;
-	goto yy998;
-yy1000:
-	yyaccept = 22;
+	if (yych == '-') goto yy941;
+	if (yych <= '/') goto yy938;
+	if (yych <= '2') goto yy960;
+	goto yy938;
+yy940:
+	yyaccept = 21;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych != '-') goto yy998;
-yy1001:
+	if (yych != '-') goto yy938;
+yy941:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy1002;
-	if (yych <= '3') goto yy1003;
-	if (yych <= '9') goto yy1004;
+	if (yych <= '2') goto yy942;
+	if (yych <= '3') goto yy943;
+	if (yych <= '9') goto yy944;
 	goto yy56;
-yy1002:
-	yyaccept = 13;
+yy942:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'm') {
 		if (yych <= '9') {
-			if (yych <= '/') goto yy681;
-			goto yy1004;
+			if (yych <= '/') goto yy621;
+			goto yy944;
 		} else {
-			if (yych == 'T') goto yy1009;
-			goto yy681;
+			if (yych == 'T') goto yy949;
+			goto yy621;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'n') goto yy1006;
-			if (yych <= 'q') goto yy681;
-			goto yy1007;
+			if (yych <= 'n') goto yy946;
+			if (yych <= 'q') goto yy621;
+			goto yy947;
 		} else {
-			if (yych <= 's') goto yy1005;
-			if (yych <= 't') goto yy1008;
-			goto yy681;
+			if (yych <= 's') goto yy945;
+			if (yych <= 't') goto yy948;
+			goto yy621;
 		}
 	}
-yy1003:
-	yyaccept = 13;
+yy943:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'm') {
 		if (yych <= '1') {
-			if (yych <= '/') goto yy681;
+			if (yych <= '/') goto yy621;
 		} else {
-			if (yych == 'T') goto yy1009;
-			goto yy681;
+			if (yych == 'T') goto yy949;
+			goto yy621;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'n') goto yy1006;
-			if (yych <= 'q') goto yy681;
-			goto yy1007;
+			if (yych <= 'n') goto yy946;
+			if (yych <= 'q') goto yy621;
+			goto yy947;
 		} else {
-			if (yych <= 's') goto yy1005;
-			if (yych <= 't') goto yy1008;
-			goto yy681;
+			if (yych <= 's') goto yy945;
+			if (yych <= 't') goto yy948;
+			goto yy621;
 		}
 	}
-yy1004:
-	yyaccept = 13;
+yy944:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych == 'T') goto yy1009;
-		if (yych <= 'm') goto yy681;
-		goto yy1006;
+		if (yych == 'T') goto yy949;
+		if (yych <= 'm') goto yy621;
+		goto yy946;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy681;
-			goto yy1007;
+			if (yych <= 'q') goto yy621;
+			goto yy947;
 		} else {
-			if (yych <= 's') goto yy1005;
-			if (yych <= 't') goto yy1008;
-			goto yy681;
+			if (yych <= 's') goto yy945;
+			if (yych <= 't') goto yy948;
+			goto yy621;
 		}
 	}
-yy1005:
+yy945:
 	yych = *++YYCURSOR;
-	if (yych == 't') goto yy1019;
+	if (yych == 't') goto yy959;
 	goto yy56;
-yy1006:
+yy946:
 	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy1019;
+	if (yych == 'd') goto yy959;
 	goto yy56;
-yy1007:
+yy947:
 	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy1019;
+	if (yych == 'd') goto yy959;
 	goto yy56;
-yy1008:
+yy948:
 	yych = *++YYCURSOR;
-	if (yych == 'h') goto yy1019;
+	if (yych == 'h') goto yy959;
 	goto yy56;
-yy1009:
+yy949:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1010;
-	if (yych <= '2') goto yy1011;
-	if (yych <= '9') goto yy1012;
+	if (yych <= '1') goto yy950;
+	if (yych <= '2') goto yy951;
+	if (yych <= '9') goto yy952;
 	goto yy56;
-yy1010:
+yy950:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1012;
-	if (yych <= ':') goto yy1013;
+	if (yych <= '9') goto yy952;
+	if (yych <= ':') goto yy953;
 	goto yy56;
-yy1011:
+yy951:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '4') goto yy1012;
-	if (yych == ':') goto yy1013;
+	if (yych <= '4') goto yy952;
+	if (yych == ':') goto yy953;
 	goto yy56;
-yy1012:
+yy952:
 	yych = *++YYCURSOR;
 	if (yych != ':') goto yy56;
-yy1013:
+yy953:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1014;
-	if (yych <= '9') goto yy1015;
+	if (yych <= '5') goto yy954;
+	if (yych <= '9') goto yy955;
 	goto yy56;
-yy1014:
+yy954:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1015;
-	if (yych <= ':') goto yy1016;
+	if (yych <= '9') goto yy955;
+	if (yych <= ':') goto yy956;
 	goto yy56;
-yy1015:
+yy955:
 	yych = *++YYCURSOR;
 	if (yych != ':') goto yy56;
-yy1016:
+yy956:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1017;
-	if (yych <= '6') goto yy1018;
-	if (yych <= '9') goto yy866;
+	if (yych <= '5') goto yy957;
+	if (yych <= '6') goto yy958;
+	if (yych <= '9') goto yy806;
 	goto yy56;
-yy1017:
+yy957:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy867;
-	if (yych <= '9') goto yy866;
-	goto yy867;
-yy1018:
+	if (yych <= '/') goto yy807;
+	if (yych <= '9') goto yy806;
+	goto yy807;
+yy958:
 	yych = *++YYCURSOR;
-	if (yych == '0') goto yy866;
-	goto yy867;
-yy1019:
-	yyaccept = 13;
+	if (yych == '0') goto yy806;
+	goto yy807;
+yy959:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy1009;
-	goto yy681;
-yy1020:
-	yyaccept = 22;
+	if (yych == 'T') goto yy949;
+	goto yy621;
+yy960:
+	yyaccept = 21;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych != '-') goto yy998;
+	if (yych != '-') goto yy938;
 	yych = *++YYCURSOR;
 	if (yych <= '2') {
 		if (yych <= '/') goto yy56;
-		if (yych >= '1') goto yy1023;
+		if (yych >= '1') goto yy963;
 	} else {
-		if (yych <= '3') goto yy1024;
-		if (yych <= '9') goto yy1004;
+		if (yych <= '3') goto yy964;
+		if (yych <= '9') goto yy944;
 		goto yy56;
 	}
-	yyaccept = 13;
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'm') {
 		if (yych <= '9') {
-			if (yych <= '/') goto yy681;
-			goto yy1025;
+			if (yych <= '/') goto yy621;
+			goto yy965;
 		} else {
-			if (yych == 'T') goto yy1009;
-			goto yy681;
+			if (yych == 'T') goto yy949;
+			goto yy621;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'n') goto yy1006;
-			if (yych <= 'q') goto yy681;
-			goto yy1007;
+			if (yych <= 'n') goto yy946;
+			if (yych <= 'q') goto yy621;
+			goto yy947;
 		} else {
-			if (yych <= 's') goto yy1005;
-			if (yych <= 't') goto yy1008;
-			goto yy681;
+			if (yych <= 's') goto yy945;
+			if (yych <= 't') goto yy948;
+			goto yy621;
 		}
 	}
-yy1023:
-	yyaccept = 13;
+yy963:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'm') {
 		if (yych <= '9') {
-			if (yych <= '/') goto yy681;
-			goto yy1025;
+			if (yych <= '/') goto yy621;
+			goto yy965;
 		} else {
-			if (yych == 'T') goto yy1009;
-			goto yy681;
+			if (yych == 'T') goto yy949;
+			goto yy621;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'n') goto yy1006;
-			if (yych <= 'q') goto yy681;
-			goto yy1007;
+			if (yych <= 'n') goto yy946;
+			if (yych <= 'q') goto yy621;
+			goto yy947;
 		} else {
-			if (yych <= 's') goto yy1005;
-			if (yych <= 't') goto yy1008;
-			goto yy681;
+			if (yych <= 's') goto yy945;
+			if (yych <= 't') goto yy948;
+			goto yy621;
 		}
 	}
-yy1024:
-	yyaccept = 13;
+yy964:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'm') {
 		if (yych <= '1') {
-			if (yych <= '/') goto yy681;
+			if (yych <= '/') goto yy621;
 		} else {
-			if (yych == 'T') goto yy1009;
-			goto yy681;
+			if (yych == 'T') goto yy949;
+			goto yy621;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'n') goto yy1006;
-			if (yych <= 'q') goto yy681;
-			goto yy1007;
+			if (yych <= 'n') goto yy946;
+			if (yych <= 'q') goto yy621;
+			goto yy947;
 		} else {
-			if (yych <= 's') goto yy1005;
-			if (yych <= 't') goto yy1008;
-			goto yy681;
+			if (yych <= 's') goto yy945;
+			if (yych <= 't') goto yy948;
+			goto yy621;
 		}
 	}
-yy1025:
-	yyaccept = 21;
+yy965:
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych == 'T') goto yy1026;
-		if (yych <= 'm') goto yy479;
-		goto yy1006;
+		if (yych == 'T') goto yy966;
+		if (yych <= 'm') goto yy419;
+		goto yy946;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy479;
-			goto yy1007;
+			if (yych <= 'q') goto yy419;
+			goto yy947;
 		} else {
-			if (yych <= 's') goto yy1005;
-			if (yych <= 't') goto yy1008;
-			goto yy479;
+			if (yych <= 's') goto yy945;
+			if (yych <= 't') goto yy948;
+			goto yy419;
 		}
 	}
-yy1026:
+yy966:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1027;
-	if (yych <= '2') goto yy1028;
-	if (yych <= '9') goto yy1012;
+	if (yych <= '1') goto yy967;
+	if (yych <= '2') goto yy968;
+	if (yych <= '9') goto yy952;
 	goto yy56;
-yy1027:
+yy967:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1029;
-	if (yych <= ':') goto yy1013;
+	if (yych <= '9') goto yy969;
+	if (yych <= ':') goto yy953;
 	goto yy56;
-yy1028:
+yy968:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '4') goto yy1029;
-	if (yych == ':') goto yy1013;
+	if (yych <= '4') goto yy969;
+	if (yych == ':') goto yy953;
 	goto yy56;
-yy1029:
+yy969:
 	yych = *++YYCURSOR;
 	if (yych != ':') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1031;
-	if (yych <= '9') goto yy1015;
+	if (yych <= '5') goto yy971;
+	if (yych <= '9') goto yy955;
 	goto yy56;
-yy1031:
+yy971:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1032;
-	if (yych <= ':') goto yy1016;
+	if (yych <= '9') goto yy972;
+	if (yych <= ':') goto yy956;
 	goto yy56;
-yy1032:
+yy972:
 	yych = *++YYCURSOR;
 	if (yych != ':') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1034;
-	if (yych <= '6') goto yy1035;
-	if (yych <= '9') goto yy866;
+	if (yych <= '5') goto yy974;
+	if (yych <= '6') goto yy975;
+	if (yych <= '9') goto yy806;
 	goto yy56;
-yy1034:
+yy974:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy867;
-	if (yych <= '9') goto yy1036;
-	goto yy867;
-yy1035:
+	if (yych <= '/') goto yy807;
+	if (yych <= '9') goto yy976;
+	goto yy807;
+yy975:
 	yych = *++YYCURSOR;
-	if (yych != '0') goto yy867;
-yy1036:
-	yyaccept = 23;
+	if (yych != '0') goto yy807;
+yy976:
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych != '.') goto yy867;
+	if (yych != '.') goto yy807;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
-yy1038:
-	yyaccept = 23;
+yy978:
+	yyaccept = 22;
 	YYMARKER = ++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
 	yych = *YYCURSOR;
 	if (yych <= '-') {
-		if (yych == '+') goto yy1041;
-		if (yych <= ',') goto yy867;
-		goto yy1041;
+		if (yych == '+') goto yy981;
+		if (yych <= ',') goto yy807;
+		goto yy981;
 	} else {
 		if (yych <= '9') {
-			if (yych <= '/') goto yy867;
-			goto yy1038;
+			if (yych <= '/') goto yy807;
+			goto yy978;
 		} else {
-			if (yych != 'G') goto yy867;
+			if (yych != 'G') goto yy807;
 		}
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy1047;
+	if (yych == 'M') goto yy987;
 	goto yy56;
-yy1041:
+yy981:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1042;
-	if (yych <= '2') goto yy1043;
-	if (yych <= '9') goto yy1044;
+	if (yych <= '1') goto yy982;
+	if (yych <= '2') goto yy983;
+	if (yych <= '9') goto yy984;
 	goto yy56;
-yy1042:
+yy982:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy867;
-	if (yych <= '9') goto yy1044;
-	if (yych <= ':') goto yy1045;
-	goto yy867;
-yy1043:
+	if (yych <= '/') goto yy807;
+	if (yych <= '9') goto yy984;
+	if (yych <= ':') goto yy985;
+	goto yy807;
+yy983:
 	yych = *++YYCURSOR;
 	if (yych <= '5') {
-		if (yych <= '/') goto yy867;
-		if (yych >= '5') goto yy1046;
+		if (yych <= '/') goto yy807;
+		if (yych >= '5') goto yy986;
 	} else {
-		if (yych <= '9') goto yy866;
-		if (yych <= ':') goto yy1045;
-		goto yy867;
+		if (yych <= '9') goto yy806;
+		if (yych <= ':') goto yy985;
+		goto yy807;
 	}
-yy1044:
+yy984:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy867;
-	if (yych <= '5') goto yy1046;
-	if (yych <= '9') goto yy866;
-	if (yych >= ';') goto yy867;
-yy1045:
+	if (yych <= '/') goto yy807;
+	if (yych <= '5') goto yy986;
+	if (yych <= '9') goto yy806;
+	if (yych >= ';') goto yy807;
+yy985:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy867;
-	if (yych <= '5') goto yy1046;
-	if (yych <= '9') goto yy866;
-	goto yy867;
-yy1046:
+	if (yych <= '/') goto yy807;
+	if (yych <= '5') goto yy986;
+	if (yych <= '9') goto yy806;
+	goto yy807;
+yy986:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy867;
-	if (yych <= '9') goto yy866;
-	goto yy867;
-yy1047:
+	if (yych <= '/') goto yy807;
+	if (yych <= '9') goto yy806;
+	goto yy807;
+yy987:
 	yych = *++YYCURSOR;
 	if (yych != 'T') goto yy56;
 	yych = *++YYCURSOR;
-	if (yych == '+') goto yy1041;
-	if (yych == '-') goto yy1041;
+	if (yych == '+') goto yy981;
+	if (yych == '-') goto yy981;
 	goto yy56;
-yy1049:
+yy989:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy1050;
+	if (yych == 'C') goto yy990;
 	if (yych != 'c') goto yy56;
-yy1050:
-	yyaccept = 20;
+yy990:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
-		if (yych == '-') goto yy791;
-		goto yy818;
+		if (yych == '-') goto yy731;
+		goto yy758;
 	} else {
-		if (yych <= 'E') goto yy904;
-		if (yych == 'e') goto yy904;
-		goto yy818;
+		if (yych <= 'E') goto yy844;
+		if (yych == 'e') goto yy844;
+		goto yy758;
 	}
-yy1051:
+yy991:
 	yych = *++YYCURSOR;
-	if (yych == 'V') goto yy1052;
+	if (yych == 'V') goto yy992;
 	if (yych != 'v') goto yy56;
-yy1052:
-	yyaccept = 20;
+yy992:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
-		if (yych == '-') goto yy791;
-		goto yy818;
+		if (yych == '-') goto yy731;
+		goto yy758;
 	} else {
-		if (yych <= 'E') goto yy911;
-		if (yych == 'e') goto yy911;
-		goto yy818;
+		if (yych <= 'E') goto yy851;
+		if (yych == 'e') goto yy851;
+		goto yy758;
 	}
-yy1053:
+yy993:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1054;
+	if (yych == 'T') goto yy994;
 	if (yych != 't') goto yy56;
-yy1054:
-	yyaccept = 20;
+yy994:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
-		if (yych == '-') goto yy791;
-		goto yy818;
+		if (yych == '-') goto yy731;
+		goto yy758;
 	} else {
-		if (yych <= 'O') goto yy917;
-		if (yych == 'o') goto yy917;
-		goto yy818;
+		if (yych <= 'O') goto yy857;
+		if (yych == 'o') goto yy857;
+		goto yy758;
 	}
-yy1055:
+yy995:
 	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy1056;
+	if (yych == 'P') goto yy996;
 	if (yych != 'p') goto yy56;
-yy1056:
-	yyaccept = 20;
+yy996:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
-		if (yych == '-') goto yy791;
-		goto yy818;
+		if (yych == '-') goto yy731;
+		goto yy758;
 	} else {
-		if (yych <= 'T') goto yy1057;
-		if (yych != 't') goto yy818;
+		if (yych <= 'T') goto yy997;
+		if (yych != 't') goto yy758;
 	}
-yy1057:
-	yyaccept = 20;
+yy997:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
-		if (yych == '-') goto yy791;
-		goto yy818;
+		if (yych == '-') goto yy731;
+		goto yy758;
 	} else {
-		if (yych <= 'E') goto yy923;
-		if (yych == 'e') goto yy923;
-		goto yy818;
+		if (yych <= 'E') goto yy863;
+		if (yych == 'e') goto yy863;
+		goto yy758;
 	}
-yy1058:
+yy998:
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy1061;
-	if (yych == 'g') goto yy1061;
+	if (yych == 'G') goto yy1001;
+	if (yych == 'g') goto yy1001;
 	goto yy56;
-yy1059:
+yy999:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy1060;
+	if (yych == 'R') goto yy1000;
 	if (yych != 'r') goto yy56;
-yy1060:
-	yyaccept = 20;
+yy1000:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'H') {
-		if (yych == '-') goto yy791;
-		goto yy818;
+		if (yych == '-') goto yy731;
+		goto yy758;
 	} else {
-		if (yych <= 'I') goto yy930;
-		if (yych == 'i') goto yy930;
-		goto yy818;
+		if (yych <= 'I') goto yy870;
+		if (yych == 'i') goto yy870;
+		goto yy758;
 	}
-yy1061:
-	yyaccept = 20;
+yy1001:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
-		if (yych == '-') goto yy791;
-		goto yy818;
+		if (yych == '-') goto yy731;
+		goto yy758;
 	} else {
-		if (yych <= 'U') goto yy932;
-		if (yych == 'u') goto yy932;
-		goto yy818;
+		if (yych <= 'U') goto yy872;
+		if (yych == 'u') goto yy872;
+		goto yy758;
 	}
-yy1062:
+yy1002:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
-		if (yych == 'R') goto yy1063;
+		if (yych == 'R') goto yy1003;
 		if (yych <= 'X') goto yy56;
-		goto yy1064;
+		goto yy1004;
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy56;
 		} else {
-			if (yych == 'y') goto yy1064;
+			if (yych == 'y') goto yy1004;
 			goto yy56;
 		}
 	}
-yy1063:
-	yyaccept = 20;
+yy1003:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'B') {
-		if (yych == '-') goto yy791;
-		goto yy818;
+		if (yych == '-') goto yy731;
+		goto yy758;
 	} else {
-		if (yych <= 'C') goto yy936;
-		if (yych == 'c') goto yy936;
-		goto yy818;
+		if (yych <= 'C') goto yy876;
+		if (yych == 'c') goto yy876;
+		goto yy758;
 	}
-yy1064:
-	yyaccept = 20;
+yy1004:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy791;
-	goto yy818;
-yy1065:
+	if (yych == '-') goto yy731;
+	goto yy758;
+yy1005:
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy1066;
+	if (yych == 'B') goto yy1006;
 	if (yych != 'b') goto yy56;
-yy1066:
-	yyaccept = 20;
+yy1006:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
-		if (yych == '-') goto yy791;
-		goto yy818;
+		if (yych == '-') goto yy731;
+		goto yy758;
 	} else {
-		if (yych <= 'R') goto yy939;
-		if (yych == 'r') goto yy939;
-		goto yy818;
+		if (yych <= 'R') goto yy879;
+		if (yych == 'r') goto yy879;
+		goto yy758;
 	}
-yy1067:
+yy1007:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'L') goto yy1071;
+		if (yych == 'L') goto yy1011;
 		if (yych <= 'M') goto yy56;
-		goto yy1070;
+		goto yy1010;
 	} else {
 		if (yych <= 'l') {
 			if (yych <= 'k') goto yy56;
-			goto yy1071;
+			goto yy1011;
 		} else {
-			if (yych == 'n') goto yy1070;
+			if (yych == 'n') goto yy1010;
 			goto yy56;
 		}
 	}
-yy1068:
+yy1008:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy1069;
+	if (yych == 'N') goto yy1009;
 	if (yych != 'n') goto yy56;
-yy1069:
-	yyaccept = 20;
+yy1009:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
-		if (yych == '-') goto yy791;
-		goto yy818;
+		if (yych == '-') goto yy731;
+		goto yy758;
 	} else {
-		if (yych <= 'U') goto yy946;
-		if (yych == 'u') goto yy946;
-		goto yy818;
+		if (yych <= 'U') goto yy886;
+		if (yych == 'u') goto yy886;
+		goto yy758;
 	}
-yy1070:
-	yyaccept = 20;
+yy1010:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
-		if (yych == '-') goto yy791;
-		goto yy818;
+		if (yych == '-') goto yy731;
+		goto yy758;
 	} else {
-		if (yych <= 'E') goto yy908;
-		if (yych == 'e') goto yy908;
-		goto yy818;
+		if (yych <= 'E') goto yy848;
+		if (yych == 'e') goto yy848;
+		goto yy758;
 	}
-yy1071:
-	yyaccept = 20;
+yy1011:
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
-		if (yych == '-') goto yy791;
-		goto yy818;
+		if (yych == '-') goto yy731;
+		goto yy758;
 	} else {
-		if (yych <= 'Y') goto yy908;
-		if (yych == 'y') goto yy908;
-		goto yy818;
+		if (yych <= 'Y') goto yy848;
+		if (yych == 'y') goto yy848;
+		goto yy758;
 	}
-yy1072:
+yy1012:
 	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= '\t') {
-			if (yych <= 0x08) goto yy602;
-			goto yy755;
+			if (yych <= 0x08) goto yy542;
+			goto yy695;
 		} else {
-			if (yych <= ',') goto yy602;
-			if (yych <= '-') goto yy756;
-			goto yy755;
+			if (yych <= ',') goto yy542;
+			if (yych <= '-') goto yy696;
+			goto yy695;
 		}
 	} else {
 		if (yych <= 'U') {
-			if (yych <= '/') goto yy754;
-			if (yych <= 'T') goto yy602;
+			if (yych <= '/') goto yy694;
+			if (yych <= 'T') goto yy542;
 			goto yy79;
 		} else {
 			if (yych == 'u') goto yy79;
-			goto yy602;
+			goto yy542;
 		}
 	}
-yy1073:
+yy1013:
 	yych = *++YYCURSOR;
 	if (yych <= 'P') {
 		if (yych == 'C') goto yy121;
 		if (yych <= 'O') goto yy56;
-		goto yy610;
+		goto yy550;
 	} else {
 		if (yych <= 'c') {
 			if (yych <= 'b') goto yy56;
 			goto yy121;
 		} else {
-			if (yych == 'p') goto yy610;
+			if (yych == 'p') goto yy550;
 			goto yy56;
 		}
 	}
-yy1074:
+yy1014:
 	yych = *++YYCURSOR;
 	if (yych <= '9') {
 		if (yych <= ',') {
-			if (yych == '\t') goto yy1076;
-			goto yy1078;
+			if (yych == '\t') goto yy1016;
+			goto yy1018;
 		} else {
-			if (yych <= '-') goto yy1075;
-			if (yych <= '.') goto yy755;
-			if (yych <= '/') goto yy754;
-			goto yy765;
+			if (yych <= '-') goto yy1015;
+			if (yych <= '.') goto yy695;
+			if (yych <= '/') goto yy694;
+			goto yy705;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych == 'n') goto yy494;
-			goto yy1078;
+			if (yych == 'n') goto yy434;
+			goto yy1018;
 		} else {
-			if (yych <= 'r') goto yy495;
-			if (yych <= 's') goto yy489;
-			if (yych <= 't') goto yy492;
-			goto yy1078;
+			if (yych <= 'r') goto yy435;
+			if (yych <= 's') goto yy429;
+			if (yych <= 't') goto yy432;
+			goto yy1018;
 		}
 	}
-yy1075:
+yy1015:
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '0':	goto yy1079;
-	case '1':	goto yy1080;
+	case '0':	goto yy1019;
+	case '1':	goto yy1020;
 	case '2':
 	case '3':
 	case '4':
@@ -14919,55 +14015,55 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy642;
+	case '9':	goto yy582;
 	case 'A':
-	case 'a':	goto yy646;
+	case 'a':	goto yy586;
 	case 'D':
-	case 'd':	goto yy650;
+	case 'd':	goto yy590;
 	case 'F':
-	case 'f':	goto yy644;
+	case 'f':	goto yy584;
 	case 'J':
-	case 'j':	goto yy643;
+	case 'j':	goto yy583;
 	case 'M':
-	case 'm':	goto yy645;
+	case 'm':	goto yy585;
 	case 'N':
-	case 'n':	goto yy649;
+	case 'n':	goto yy589;
 	case 'O':
-	case 'o':	goto yy648;
+	case 'o':	goto yy588;
 	case 'S':
-	case 's':	goto yy647;
-	default:	goto yy602;
+	case 's':	goto yy587;
+	default:	goto yy542;
 	}
-yy1076:
+yy1016:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1078;
-	if (yych <= '0') goto yy760;
-	if (yych <= '1') goto yy761;
-	if (yych <= '9') goto yy762;
-	goto yy1078;
-yy1077:
+	if (yych <= '/') goto yy1018;
+	if (yych <= '0') goto yy700;
+	if (yych <= '1') goto yy701;
+	if (yych <= '9') goto yy702;
+	goto yy1018;
+yy1017:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 13) YYFILL(13);
 	yych = *YYCURSOR;
-yy1078:
+yy1018:
 	if (yych <= 'W') {
 		if (yych <= 'G') {
 			if (yych <= '.') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy1077;
+					if (yych == '\t') goto yy1017;
 					goto yy56;
 				} else {
-					if (yych <= ' ') goto yy1077;
+					if (yych <= ' ') goto yy1017;
 					if (yych <= ',') goto yy56;
-					goto yy601;
+					goto yy541;
 				}
 			} else {
 				if (yych <= 'C') {
-					if (yych == 'A') goto yy598;
+					if (yych == 'A') goto yy538;
 					goto yy56;
 				} else {
-					if (yych <= 'D') goto yy490;
-					if (yych == 'F') goto yy491;
+					if (yych <= 'D') goto yy430;
+					if (yych == 'F') goto yy431;
 					goto yy56;
 				}
 			}
@@ -14975,22 +14071,22 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'N') {
 				if (yych <= 'J') {
 					if (yych <= 'H') goto yy65;
-					if (yych <= 'I') goto yy499;
-					goto yy503;
+					if (yych <= 'I') goto yy439;
+					goto yy443;
 				} else {
 					if (yych <= 'L') goto yy56;
-					if (yych <= 'M') goto yy487;
-					goto yy506;
+					if (yych <= 'M') goto yy427;
+					goto yy446;
 				}
 			} else {
 				if (yych <= 'S') {
-					if (yych <= 'O') goto yy505;
+					if (yych <= 'O') goto yy445;
 					if (yych <= 'R') goto yy56;
-					goto yy488;
+					goto yy428;
 				} else {
 					if (yych <= 'T') goto yy70;
 					if (yych <= 'U') goto yy63;
-					if (yych <= 'V') goto yy501;
+					if (yych <= 'V') goto yy441;
 					goto yy69;
 				}
 			}
@@ -14999,33 +14095,33 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych <= '`') {
-					if (yych <= 'X') goto yy502;
+					if (yych <= 'X') goto yy442;
 					if (yych <= 'Y') goto yy68;
 					goto yy56;
 				} else {
-					if (yych <= 'a') goto yy598;
+					if (yych <= 'a') goto yy538;
 					if (yych <= 'c') goto yy56;
-					goto yy490;
+					goto yy430;
 				}
 			} else {
 				if (yych <= 'g') {
-					if (yych == 'f') goto yy491;
+					if (yych == 'f') goto yy431;
 					goto yy56;
 				} else {
 					if (yych <= 'h') goto yy65;
-					if (yych == 'j') goto yy503;
+					if (yych == 'j') goto yy443;
 					goto yy56;
 				}
 			}
 		} else {
 			if (yych <= 'u') {
 				if (yych <= 'o') {
-					if (yych <= 'm') goto yy487;
-					if (yych <= 'n') goto yy506;
-					goto yy505;
+					if (yych <= 'm') goto yy427;
+					if (yych <= 'n') goto yy446;
+					goto yy445;
 				} else {
 					if (yych <= 'r') goto yy56;
-					if (yych <= 's') goto yy488;
+					if (yych <= 's') goto yy428;
 					if (yych <= 't') goto yy70;
 					goto yy63;
 				}
@@ -15041,202 +14137,202 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy1079:
+yy1019:
 	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= ',') goto yy56;
-		if (yych <= '-') goto yy679;
-		goto yy626;
+		if (yych <= '-') goto yy619;
+		goto yy566;
 	} else {
 		if (yych <= '/') goto yy56;
-		if (yych <= '9') goto yy1081;
+		if (yych <= '9') goto yy1021;
 		goto yy56;
 	}
-yy1080:
+yy1020:
 	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= ',') goto yy56;
-		if (yych <= '-') goto yy679;
-		goto yy626;
+		if (yych <= '-') goto yy619;
+		goto yy566;
 	} else {
 		if (yych <= '/') goto yy56;
 		if (yych >= '3') goto yy56;
 	}
-yy1081:
+yy1021:
 	yych = *++YYCURSOR;
 	if (yych <= ',') goto yy56;
-	if (yych <= '-') goto yy1082;
-	if (yych <= '.') goto yy626;
+	if (yych <= '-') goto yy1022;
+	if (yych <= '.') goto yy566;
 	goto yy56;
-yy1082:
+yy1022:
 	yych = *++YYCURSOR;
 	if (yych <= '2') {
 		if (yych <= '/') goto yy56;
-		if (yych >= '1') goto yy1084;
+		if (yych >= '1') goto yy1024;
 	} else {
-		if (yych <= '3') goto yy1085;
-		if (yych <= '9') goto yy683;
+		if (yych <= '3') goto yy1025;
+		if (yych <= '9') goto yy623;
 		goto yy56;
 	}
-	yyaccept = 13;
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy681;
-		if (yych <= '9') goto yy1086;
-		if (yych <= 'm') goto yy681;
-		goto yy685;
+		if (yych <= '/') goto yy621;
+		if (yych <= '9') goto yy1026;
+		if (yych <= 'm') goto yy621;
+		goto yy625;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy681;
-			goto yy686;
+			if (yych <= 'q') goto yy621;
+			goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
-			goto yy681;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
+			goto yy621;
 		}
 	}
-yy1084:
-	yyaccept = 13;
+yy1024:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy681;
-		if (yych <= '9') goto yy1086;
-		if (yych <= 'm') goto yy681;
-		goto yy685;
+		if (yych <= '/') goto yy621;
+		if (yych <= '9') goto yy1026;
+		if (yych <= 'm') goto yy621;
+		goto yy625;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy681;
-			goto yy686;
+			if (yych <= 'q') goto yy621;
+			goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
-			goto yy681;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
+			goto yy621;
 		}
 	}
-yy1085:
-	yyaccept = 13;
+yy1025:
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
 		if (yych <= '1') {
-			if (yych <= '/') goto yy681;
+			if (yych <= '/') goto yy621;
 		} else {
-			if (yych <= '9') goto yy628;
-			if (yych <= 'm') goto yy681;
-			goto yy685;
+			if (yych <= '9') goto yy568;
+			if (yych <= 'm') goto yy621;
+			goto yy625;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy681;
-			goto yy686;
+			if (yych <= 'q') goto yy621;
+			goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
-			goto yy681;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
+			goto yy621;
 		}
 	}
-yy1086:
-	yyaccept = 15;
+yy1026:
+	yyaccept = 14;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy788;
-		if (yych <= '9') goto yy629;
-		if (yych <= 'm') goto yy788;
-		goto yy685;
+		if (yych <= '/') goto yy728;
+		if (yych <= '9') goto yy569;
+		if (yych <= 'm') goto yy728;
+		goto yy625;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy788;
-			goto yy686;
+			if (yych <= 'q') goto yy728;
+			goto yy626;
 		} else {
-			if (yych <= 's') goto yy684;
-			if (yych <= 't') goto yy687;
-			goto yy788;
+			if (yych <= 's') goto yy624;
+			if (yych <= 't') goto yy627;
+			goto yy728;
 		}
 	}
-yy1087:
+yy1027:
 	yych = *++YYCURSOR;
 	if (yych <= '9') {
 		if (yych <= '-') {
-			if (yych == '\t') goto yy1076;
-			if (yych <= ',') goto yy1078;
-			goto yy1075;
+			if (yych == '\t') goto yy1016;
+			if (yych <= ',') goto yy1018;
+			goto yy1015;
 		} else {
-			if (yych <= '.') goto yy1088;
-			if (yych <= '/') goto yy754;
-			if (yych <= '5') goto yy1090;
-			goto yy765;
+			if (yych <= '.') goto yy1028;
+			if (yych <= '/') goto yy694;
+			if (yych <= '5') goto yy1030;
+			goto yy705;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych <= ':') goto yy1089;
-			if (yych == 'n') goto yy494;
-			goto yy1078;
+			if (yych <= ':') goto yy1029;
+			if (yych == 'n') goto yy434;
+			goto yy1018;
 		} else {
-			if (yych <= 'r') goto yy495;
-			if (yych <= 's') goto yy489;
-			if (yych <= 't') goto yy492;
-			goto yy1078;
+			if (yych <= 'r') goto yy435;
+			if (yych <= 's') goto yy429;
+			if (yych <= 't') goto yy432;
+			goto yy1018;
 		}
 	}
-yy1088:
+yy1028:
 	yych = *++YYCURSOR;
 	if (yych <= '1') {
-		if (yych <= '/') goto yy602;
-		if (yych <= '0') goto yy1112;
-		goto yy1113;
+		if (yych <= '/') goto yy542;
+		if (yych <= '0') goto yy1052;
+		goto yy1053;
 	} else {
-		if (yych <= '5') goto yy1114;
-		if (yych <= '9') goto yy1115;
-		goto yy602;
+		if (yych <= '5') goto yy1054;
+		if (yych <= '9') goto yy1055;
+		goto yy542;
 	}
-yy1089:
+yy1029:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1107;
-	if (yych <= '9') goto yy1108;
+	if (yych <= '5') goto yy1047;
+	if (yych <= '9') goto yy1048;
 	goto yy56;
-yy1090:
+yy1030:
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy809;
+	if (yych == '-') goto yy749;
 	if (yych <= '/') goto yy60;
 	if (yych >= ':') goto yy60;
-	yyaccept = 24;
+	yyaccept = 23;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'L') {
 		if (yych <= '3') {
 			if (yych <= '-') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy815;
+					if (yych == '\t') goto yy755;
 				} else {
-					if (yych <= ' ') goto yy815;
-					if (yych >= '-') goto yy812;
+					if (yych <= ' ') goto yy755;
+					if (yych >= '-') goto yy752;
 				}
 			} else {
 				if (yych <= '0') {
-					if (yych <= '.') goto yy816;
-					if (yych <= '/') goto yy813;
-					goto yy1093;
+					if (yych <= '.') goto yy756;
+					if (yych <= '/') goto yy753;
+					goto yy1033;
 				} else {
-					if (yych <= '1') goto yy1094;
-					if (yych <= '2') goto yy1095;
-					goto yy1096;
+					if (yych <= '1') goto yy1034;
+					if (yych <= '2') goto yy1035;
+					goto yy1036;
 				}
 			}
 		} else {
 			if (yych <= 'A') {
 				if (yych <= '9') {
-					if (yych <= '5') goto yy1097;
-					if (yych <= '6') goto yy1098;
+					if (yych <= '5') goto yy1037;
+					if (yych <= '6') goto yy1038;
 					goto yy54;
 				} else {
-					if (yych <= ':') goto yy831;
-					if (yych >= 'A') goto yy815;
+					if (yych <= ':') goto yy771;
+					if (yych >= 'A') goto yy755;
 				}
 			} else {
 				if (yych <= 'E') {
-					if (yych == 'D') goto yy815;
+					if (yych == 'D') goto yy755;
 				} else {
-					if (yych == 'G') goto yy1092;
-					if (yych <= 'J') goto yy815;
+					if (yych == 'G') goto yy1032;
+					if (yych <= 'J') goto yy755;
 				}
 			}
 		}
@@ -15244,40 +14340,40 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'h') {
 			if (yych <= '`') {
 				if (yych <= 'V') {
-					if (yych <= 'O') goto yy815;
-					if (yych >= 'S') goto yy815;
+					if (yych <= 'O') goto yy755;
+					if (yych >= 'S') goto yy755;
 				} else {
-					if (yych <= 'W') goto yy834;
-					if (yych <= 'Y') goto yy815;
+					if (yych <= 'W') goto yy774;
+					if (yych <= 'Y') goto yy755;
 				}
 			} else {
 				if (yych <= 'd') {
-					if (yych <= 'a') goto yy815;
-					if (yych >= 'd') goto yy815;
+					if (yych <= 'a') goto yy755;
+					if (yych >= 'd') goto yy755;
 				} else {
-					if (yych == 'f') goto yy815;
-					if (yych >= 'h') goto yy815;
+					if (yych == 'f') goto yy755;
+					if (yych >= 'h') goto yy755;
 				}
 			}
 		} else {
 			if (yych <= 'u') {
 				if (yych <= 'l') {
-					if (yych == 'j') goto yy815;
+					if (yych == 'j') goto yy755;
 				} else {
-					if (yych <= 'o') goto yy815;
-					if (yych >= 's') goto yy815;
+					if (yych <= 'o') goto yy755;
+					if (yych >= 's') goto yy755;
 				}
 			} else {
 				if (yych <= 'x') {
-					if (yych == 'w') goto yy815;
+					if (yych == 'w') goto yy755;
 				} else {
-					if (yych <= 'y') goto yy815;
-					if (yych == 0xC2) goto yy815;
+					if (yych <= 'y') goto yy755;
+					if (yych == 0xC2) goto yy755;
 				}
 			}
 		}
 	}
-yy1092:
+yy1032:
 #line 1204 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("gnunocolon");
@@ -15300,44 +14396,44 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_GNU_NOCOLON;
 	}
-#line 15304 "ext/date/lib/parse_date.c"
-yy1093:
+#line 14400 "ext/date/lib/parse_date.c"
+yy1033:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '0') goto yy1105;
-	if (yych <= '9') goto yy1106;
+	if (yych <= '0') goto yy1045;
+	if (yych <= '9') goto yy1046;
 	goto yy60;
-yy1094:
+yy1034:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '2') goto yy1104;
-	if (yych <= '9') goto yy1103;
+	if (yych <= '2') goto yy1044;
+	if (yych <= '9') goto yy1043;
 	goto yy60;
-yy1095:
+yy1035:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '9') goto yy1103;
+	if (yych <= '9') goto yy1043;
 	goto yy60;
-yy1096:
+yy1036:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '5') goto yy1101;
-	if (yych <= '6') goto yy1102;
-	if (yych <= '9') goto yy1099;
+	if (yych <= '5') goto yy1041;
+	if (yych <= '6') goto yy1042;
+	if (yych <= '9') goto yy1039;
 	goto yy60;
-yy1097:
+yy1037:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '9') goto yy1099;
+	if (yych <= '9') goto yy1039;
 	goto yy60;
-yy1098:
+yy1038:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
-	if (yych <= '0') goto yy1099;
+	if (yych <= '0') goto yy1039;
 	if (yych <= '9') goto yy54;
 	goto yy60;
-yy1099:
-	yyaccept = 25;
+yy1039:
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 2) {
 		goto yy54;
@@ -15378,7 +14474,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		} else {
 			if (yych <= 'w') {
-				if (yych <= 'r') goto yy1100;
+				if (yych <= 'r') goto yy1040;
 				if (yych != 'v') goto yy60;
 			} else {
 				if (yych <= 'y') {
@@ -15389,7 +14485,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy1100:
+yy1040:
 #line 1250 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
@@ -15409,36 +14505,36 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_NOCOLON;
 	}
-#line 15413 "ext/date/lib/parse_date.c"
-yy1101:
-	yyaccept = 25;
+#line 14509 "ext/date/lib/parse_date.c"
+yy1041:
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'E') {
 			if (yych <= ' ') {
 				if (yych == '\t') goto yy60;
-				if (yych <= 0x1F) goto yy1100;
+				if (yych <= 0x1F) goto yy1040;
 				goto yy60;
 			} else {
 				if (yych <= '9') {
-					if (yych <= '/') goto yy1100;
-					goto yy845;
+					if (yych <= '/') goto yy1040;
+					goto yy785;
 				} else {
 					if (yych == 'D') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		} else {
 			if (yych <= 'L') {
-				if (yych == 'G') goto yy1100;
+				if (yych == 'G') goto yy1040;
 				if (yych <= 'H') goto yy60;
-				goto yy1100;
+				goto yy1040;
 			} else {
 				if (yych <= 'R') {
 					if (yych <= 'M') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
-					if (yych == 'V') goto yy1100;
+					if (yych == 'V') goto yy1040;
 					goto yy60;
 				}
 			}
@@ -15447,71 +14543,71 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych == 'Y') goto yy60;
-				if (yych <= 'c') goto yy1100;
+				if (yych <= 'c') goto yy1040;
 				goto yy60;
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy1100;
+					if (yych <= 'e') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 'h') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
-					if (yych == 'v') goto yy1100;
+					if (yych == 'v') goto yy1040;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy1100;
+					if (yych <= 'x') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 0xC2) goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		}
 	}
-yy1102:
-	yyaccept = 25;
+yy1042:
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'D') {
 			if (yych <= ' ') {
 				if (yych == '\t') goto yy60;
-				if (yych <= 0x1F) goto yy1100;
+				if (yych <= 0x1F) goto yy1040;
 				goto yy60;
 			} else {
 				if (yych <= '6') {
-					if (yych <= '/') goto yy1100;
-					goto yy845;
+					if (yych <= '/') goto yy1040;
+					goto yy785;
 				} else {
 					if (yych <= '9') goto yy54;
-					if (yych <= 'C') goto yy1100;
+					if (yych <= 'C') goto yy1040;
 					goto yy60;
 				}
 			}
 		} else {
 			if (yych <= 'L') {
 				if (yych <= 'F') {
-					if (yych <= 'E') goto yy1100;
+					if (yych <= 'E') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 'H') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			} else {
 				if (yych <= 'R') {
 					if (yych <= 'M') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
-					if (yych == 'V') goto yy1100;
+					if (yych == 'V') goto yy1040;
 					goto yy60;
 				}
 			}
@@ -15520,66 +14616,66 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych == 'Y') goto yy60;
-				if (yych <= 'c') goto yy1100;
+				if (yych <= 'c') goto yy1040;
 				goto yy60;
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy1100;
+					if (yych <= 'e') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 'h') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
-					if (yych == 'v') goto yy1100;
+					if (yych == 'v') goto yy1040;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy1100;
+					if (yych <= 'x') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 0xC2) goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		}
 	}
-yy1103:
-	yyaccept = 25;
+yy1043:
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'E') {
 			if (yych <= ' ') {
 				if (yych == '\t') goto yy60;
-				if (yych <= 0x1F) goto yy1100;
+				if (yych <= 0x1F) goto yy1040;
 				goto yy60;
 			} else {
 				if (yych <= '9') {
-					if (yych <= '/') goto yy1100;
-					goto yy845;
+					if (yych <= '/') goto yy1040;
+					goto yy785;
 				} else {
 					if (yych == 'D') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		} else {
 			if (yych <= 'L') {
-				if (yych == 'G') goto yy1100;
+				if (yych == 'G') goto yy1040;
 				if (yych <= 'H') goto yy60;
-				goto yy1100;
+				goto yy1040;
 			} else {
 				if (yych <= 'R') {
 					if (yych <= 'M') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
-					if (yych == 'V') goto yy1100;
+					if (yych == 'V') goto yy1040;
 					goto yy60;
 				}
 			}
@@ -15588,77 +14684,77 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych == 'Y') goto yy60;
-				if (yych <= 'c') goto yy1100;
+				if (yych <= 'c') goto yy1040;
 				goto yy60;
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy1100;
+					if (yych <= 'e') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 'h') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
-					if (yych == 'v') goto yy1100;
+					if (yych == 'v') goto yy1040;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy1100;
+					if (yych <= 'x') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 0xC2) goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		}
 	}
-yy1104:
-	yyaccept = 25;
+yy1044:
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'V') {
 		if (yych <= 'C') {
 			if (yych <= '/') {
 				if (yych <= '\t') {
-					if (yych <= 0x08) goto yy1100;
+					if (yych <= 0x08) goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == ' ') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			} else {
 				if (yych <= '2') {
-					if (yych <= '0') goto yy869;
-					goto yy870;
+					if (yych <= '0') goto yy809;
+					goto yy810;
 				} else {
-					if (yych <= '3') goto yy871;
-					if (yych <= '9') goto yy845;
-					goto yy1100;
+					if (yych <= '3') goto yy811;
+					if (yych <= '9') goto yy785;
+					goto yy1040;
 				}
 			}
 		} else {
 			if (yych <= 'H') {
 				if (yych <= 'E') {
 					if (yych <= 'D') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
-					if (yych == 'G') goto yy1100;
+					if (yych == 'G') goto yy1040;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'M') {
-					if (yych <= 'L') goto yy1100;
+					if (yych <= 'L') goto yy1040;
 					goto yy60;
 				} else {
-					if (yych <= 'R') goto yy1100;
+					if (yych <= 'R') goto yy1040;
 					if (yych <= 'U') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		}
@@ -15667,81 +14763,81 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'd') {
 				if (yych <= 'X') {
 					if (yych <= 'W') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
 					if (yych <= 'Y') goto yy60;
-					if (yych <= 'c') goto yy1100;
+					if (yych <= 'c') goto yy1040;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy1100;
+					if (yych <= 'e') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 'h') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
-					if (yych == 'v') goto yy1100;
+					if (yych == 'v') goto yy1040;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy1100;
+					if (yych <= 'x') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 0xC2) goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		}
 	}
-yy1105:
-	yyaccept = 25;
+yy1045:
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'V') {
 		if (yych <= 'C') {
 			if (yych <= '/') {
 				if (yych <= '\t') {
-					if (yych <= 0x08) goto yy1100;
+					if (yych <= 0x08) goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == ' ') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			} else {
 				if (yych <= '2') {
-					if (yych <= '0') goto yy901;
-					goto yy870;
+					if (yych <= '0') goto yy841;
+					goto yy810;
 				} else {
-					if (yych <= '3') goto yy871;
-					if (yych <= '9') goto yy845;
-					goto yy1100;
+					if (yych <= '3') goto yy811;
+					if (yych <= '9') goto yy785;
+					goto yy1040;
 				}
 			}
 		} else {
 			if (yych <= 'H') {
 				if (yych <= 'E') {
 					if (yych <= 'D') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
-					if (yych == 'G') goto yy1100;
+					if (yych == 'G') goto yy1040;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'M') {
-					if (yych <= 'L') goto yy1100;
+					if (yych <= 'L') goto yy1040;
 					goto yy60;
 				} else {
-					if (yych <= 'R') goto yy1100;
+					if (yych <= 'R') goto yy1040;
 					if (yych <= 'U') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		}
@@ -15750,81 +14846,81 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'd') {
 				if (yych <= 'X') {
 					if (yych <= 'W') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
 					if (yych <= 'Y') goto yy60;
-					if (yych <= 'c') goto yy1100;
+					if (yych <= 'c') goto yy1040;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy1100;
+					if (yych <= 'e') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 'h') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
-					if (yych == 'v') goto yy1100;
+					if (yych == 'v') goto yy1040;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy1100;
+					if (yych <= 'x') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 0xC2) goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		}
 	}
-yy1106:
-	yyaccept = 25;
+yy1046:
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'V') {
 		if (yych <= 'C') {
 			if (yych <= '/') {
 				if (yych <= '\t') {
-					if (yych <= 0x08) goto yy1100;
+					if (yych <= 0x08) goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == ' ') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			} else {
 				if (yych <= '2') {
-					if (yych <= '0') goto yy869;
-					goto yy870;
+					if (yych <= '0') goto yy809;
+					goto yy810;
 				} else {
-					if (yych <= '3') goto yy871;
-					if (yych <= '9') goto yy845;
-					goto yy1100;
+					if (yych <= '3') goto yy811;
+					if (yych <= '9') goto yy785;
+					goto yy1040;
 				}
 			}
 		} else {
 			if (yych <= 'H') {
 				if (yych <= 'E') {
 					if (yych <= 'D') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
-					if (yych == 'G') goto yy1100;
+					if (yych == 'G') goto yy1040;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'M') {
-					if (yych <= 'L') goto yy1100;
+					if (yych <= 'L') goto yy1040;
 					goto yy60;
 				} else {
-					if (yych <= 'R') goto yy1100;
+					if (yych <= 'R') goto yy1040;
 					if (yych <= 'U') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		}
@@ -15833,210 +14929,210 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'd') {
 				if (yych <= 'X') {
 					if (yych <= 'W') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
 					if (yych <= 'Y') goto yy60;
-					if (yych <= 'c') goto yy1100;
+					if (yych <= 'c') goto yy1040;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy1100;
+					if (yych <= 'e') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 'h') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy60;
-					goto yy1100;
+					goto yy1040;
 				} else {
-					if (yych == 'v') goto yy1100;
+					if (yych == 'v') goto yy1040;
 					goto yy60;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy1100;
+					if (yych <= 'x') goto yy1040;
 					goto yy60;
 				} else {
 					if (yych == 0xC2) goto yy60;
-					goto yy1100;
+					goto yy1040;
 				}
 			}
 		}
 	}
-yy1107:
-	yyaccept = 11;
+yy1047:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy1109;
-		goto yy515;
+		if (yych == '.') goto yy1049;
+		goto yy455;
 	} else {
-		if (yych <= '9') goto yy1108;
-		if (yych <= ':') goto yy1109;
-		goto yy515;
+		if (yych <= '9') goto yy1048;
+		if (yych <= ':') goto yy1049;
+		goto yy455;
 	}
-yy1108:
-	yyaccept = 11;
+yy1048:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy1109;
-	if (yych != ':') goto yy515;
-yy1109:
+	if (yych == '.') goto yy1049;
+	if (yych != ':') goto yy455;
+yy1049:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1110;
-	if (yych <= '6') goto yy1111;
-	if (yych <= '9') goto yy520;
+	if (yych <= '5') goto yy1050;
+	if (yych <= '6') goto yy1051;
+	if (yych <= '9') goto yy460;
 	goto yy56;
-yy1110:
-	yyaccept = 11;
+yy1050:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy521;
-	if (yych <= '/') goto yy515;
-	if (yych <= '9') goto yy520;
-	goto yy515;
-yy1111:
-	yyaccept = 11;
+	if (yych == '.') goto yy461;
+	if (yych <= '/') goto yy455;
+	if (yych <= '9') goto yy460;
+	goto yy455;
+yy1051:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy521;
-	if (yych == '0') goto yy520;
-	goto yy515;
-yy1112:
-	yyaccept = 11;
+	if (yych == '.') goto yy461;
+	if (yych == '0') goto yy460;
+	goto yy455;
+yy1052:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
-		if (yych <= ',') goto yy515;
-		if (yych <= '-') goto yy626;
-		goto yy1116;
+		if (yych <= ',') goto yy455;
+		if (yych <= '-') goto yy566;
+		goto yy1056;
 	} else {
-		if (yych <= '/') goto yy515;
-		if (yych <= '9') goto yy1115;
-		if (yych <= ':') goto yy1109;
-		goto yy515;
+		if (yych <= '/') goto yy455;
+		if (yych <= '9') goto yy1055;
+		if (yych <= ':') goto yy1049;
+		goto yy455;
 	}
-yy1113:
-	yyaccept = 11;
+yy1053:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych <= ',') goto yy515;
-		if (yych <= '-') goto yy626;
-		if (yych <= '.') goto yy1116;
-		goto yy515;
+		if (yych <= ',') goto yy455;
+		if (yych <= '-') goto yy566;
+		if (yych <= '.') goto yy1056;
+		goto yy455;
 	} else {
-		if (yych <= '2') goto yy1115;
-		if (yych <= '9') goto yy1108;
-		if (yych <= ':') goto yy1109;
-		goto yy515;
+		if (yych <= '2') goto yy1055;
+		if (yych <= '9') goto yy1048;
+		if (yych <= ':') goto yy1049;
+		goto yy455;
 	}
-yy1114:
-	yyaccept = 11;
+yy1054:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
-		if (yych <= ',') goto yy515;
-		if (yych <= '-') goto yy626;
-		goto yy1116;
+		if (yych <= ',') goto yy455;
+		if (yych <= '-') goto yy566;
+		goto yy1056;
 	} else {
-		if (yych <= '/') goto yy515;
-		if (yych <= '9') goto yy1108;
-		if (yych <= ':') goto yy1109;
-		goto yy515;
+		if (yych <= '/') goto yy455;
+		if (yych <= '9') goto yy1048;
+		if (yych <= ':') goto yy1049;
+		goto yy455;
 	}
-yy1115:
-	yyaccept = 11;
+yy1055:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
-		if (yych <= ',') goto yy515;
-		if (yych <= '-') goto yy626;
+		if (yych <= ',') goto yy455;
+		if (yych <= '-') goto yy566;
 	} else {
-		if (yych == ':') goto yy1109;
-		goto yy515;
+		if (yych == ':') goto yy1049;
+		goto yy455;
 	}
-yy1116:
+yy1056:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1117;
-	if (yych <= '6') goto yy1118;
-	if (yych <= '9') goto yy634;
+	if (yych <= '5') goto yy1057;
+	if (yych <= '6') goto yy1058;
+	if (yych <= '9') goto yy574;
 	goto yy56;
-yy1117:
-	yyaccept = 11;
+yy1057:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy521;
-	if (yych <= '/') goto yy515;
-	if (yych <= '9') goto yy1119;
-	goto yy515;
-yy1118:
-	yyaccept = 11;
+	if (yych == '.') goto yy461;
+	if (yych <= '/') goto yy455;
+	if (yych <= '9') goto yy1059;
+	goto yy455;
+yy1058:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy521;
-		goto yy515;
+		if (yych == '.') goto yy461;
+		goto yy455;
 	} else {
-		if (yych <= '0') goto yy1119;
-		if (yych <= '9') goto yy635;
-		goto yy515;
+		if (yych <= '0') goto yy1059;
+		if (yych <= '9') goto yy575;
+		goto yy455;
 	}
-yy1119:
-	yyaccept = 11;
+yy1059:
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy521;
-	if (yych <= '/') goto yy515;
-	if (yych <= '9') goto yy629;
-	goto yy515;
-yy1120:
+	if (yych == '.') goto yy461;
+	if (yych <= '/') goto yy455;
+	if (yych <= '9') goto yy569;
+	goto yy455;
+yy1060:
 	yych = *++YYCURSOR;
 	if (yych <= '9') {
 		if (yych <= '-') {
-			if (yych == '\t') goto yy484;
-			if (yych <= ',') goto yy486;
-			goto yy1075;
+			if (yych == '\t') goto yy424;
+			if (yych <= ',') goto yy426;
+			goto yy1015;
 		} else {
-			if (yych <= '.') goto yy498;
-			if (yych <= '/') goto yy496;
-			if (yych <= '5') goto yy1090;
-			goto yy765;
+			if (yych <= '.') goto yy438;
+			if (yych <= '/') goto yy436;
+			if (yych <= '5') goto yy1030;
+			goto yy705;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych <= ':') goto yy507;
-			if (yych == 'n') goto yy494;
-			goto yy486;
+			if (yych <= ':') goto yy447;
+			if (yych == 'n') goto yy434;
+			goto yy426;
 		} else {
-			if (yych <= 'r') goto yy495;
-			if (yych <= 's') goto yy489;
-			if (yych <= 't') goto yy492;
-			goto yy486;
+			if (yych <= 'r') goto yy435;
+			if (yych <= 's') goto yy429;
+			if (yych <= 't') goto yy432;
+			goto yy426;
 		}
 	}
-yy1121:
+yy1061:
 	yych = *++YYCURSOR;
 	if (yych <= '9') {
 		if (yych <= '-') {
-			if (yych == '\t') goto yy1076;
-			if (yych <= ',') goto yy1078;
-			goto yy1075;
+			if (yych == '\t') goto yy1016;
+			if (yych <= ',') goto yy1018;
+			goto yy1015;
 		} else {
-			if (yych <= '.') goto yy1088;
-			if (yych <= '/') goto yy496;
-			if (yych <= '5') goto yy1090;
-			goto yy765;
+			if (yych <= '.') goto yy1028;
+			if (yych <= '/') goto yy436;
+			if (yych <= '5') goto yy1030;
+			goto yy705;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych <= ':') goto yy1089;
-			if (yych == 'n') goto yy494;
-			goto yy1078;
+			if (yych <= ':') goto yy1029;
+			if (yych == 'n') goto yy434;
+			goto yy1018;
 		} else {
-			if (yych <= 'r') goto yy495;
-			if (yych <= 's') goto yy489;
-			if (yych <= 't') goto yy492;
-			goto yy1078;
+			if (yych <= 'r') goto yy435;
+			if (yych <= 's') goto yy429;
+			if (yych <= 't') goto yy432;
+			goto yy1018;
 		}
 	}
-yy1122:
+yy1062:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -16052,12 +15148,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'e') goto yy1123;
+			if (yych <= 'e') goto yy1063;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1123:
+yy1063:
 	yych = *++YYCURSOR;
 	if (yych <= 'V') {
 		if (yych <= ')') {
@@ -16073,12 +15169,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'v') goto yy1124;
+			if (yych <= 'v') goto yy1064;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1124:
+yy1064:
 	yych = *++YYCURSOR;
 	if (yych <= 'I') {
 		if (yych <= ')') {
@@ -16094,12 +15190,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'i') goto yy1125;
+			if (yych <= 'i') goto yy1065;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1125:
+yy1065:
 	yych = *++YYCURSOR;
 	if (yych <= 'O') {
 		if (yych <= ')') {
@@ -16115,65 +15211,65 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'o') goto yy1126;
+			if (yych <= 'o') goto yy1066;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1126:
+yy1066:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'U') goto yy1127;
+		if (yych <= 'U') goto yy1067;
 		if (yych != 'u') goto yy3;
 	}
-yy1127:
+yy1067:
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1128;
+	if (yych == 'S') goto yy1068;
 	if (yych != 's') goto yy56;
-yy1128:
+yy1068:
 	yych = *++YYCURSOR;
-	if (yych == '\t') goto yy1129;
+	if (yych == '\t') goto yy1069;
 	if (yych != ' ') goto yy56;
-yy1129:
+yy1069:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
 	yych = *YYCURSOR;
-yy1130:
+yy1070:
 	if (yych <= 'X') {
 		if (yych <= 'G') {
 			if (yych <= ' ') {
-				if (yych == '\t') goto yy1129;
+				if (yych == '\t') goto yy1069;
 				if (yych <= 0x1F) goto yy56;
-				goto yy1129;
+				goto yy1069;
 			} else {
 				if (yych <= 'D') {
 					if (yych <= 'C') goto yy56;
-					goto yy1136;
+					goto yy1076;
 				} else {
-					if (yych == 'F') goto yy1137;
+					if (yych == 'F') goto yy1077;
 					goto yy56;
 				}
 			}
 		} else {
 			if (yych <= 'S') {
 				if (yych <= 'L') {
-					if (yych <= 'H') goto yy1135;
+					if (yych <= 'H') goto yy1075;
 					goto yy56;
 				} else {
-					if (yych <= 'M') goto yy1131;
+					if (yych <= 'M') goto yy1071;
 					if (yych <= 'R') goto yy56;
-					goto yy1134;
+					goto yy1074;
 				}
 			} else {
 				if (yych <= 'U') {
-					if (yych <= 'T') goto yy1140;
-					goto yy1133;
+					if (yych <= 'T') goto yy1080;
+					goto yy1073;
 				} else {
-					if (yych == 'W') goto yy1139;
+					if (yych == 'W') goto yy1079;
 					goto yy56;
 				}
 			}
@@ -16182,17 +15278,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'r') {
 			if (yych <= 'f') {
 				if (yych <= 'c') {
-					if (yych <= 'Y') goto yy1138;
+					if (yych <= 'Y') goto yy1078;
 					goto yy56;
 				} else {
-					if (yych <= 'd') goto yy1136;
+					if (yych <= 'd') goto yy1076;
 					if (yych <= 'e') goto yy56;
-					goto yy1137;
+					goto yy1077;
 				}
 			} else {
 				if (yych <= 'h') {
 					if (yych <= 'g') goto yy56;
-					goto yy1135;
+					goto yy1075;
 				} else {
 					if (yych != 'm') goto yy56;
 				}
@@ -16200,147 +15296,147 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 't') {
-					if (yych <= 's') goto yy1134;
-					goto yy1140;
+					if (yych <= 's') goto yy1074;
+					goto yy1080;
 				} else {
-					if (yych <= 'u') goto yy1133;
+					if (yych <= 'u') goto yy1073;
 					if (yych <= 'v') goto yy56;
-					goto yy1139;
+					goto yy1079;
 				}
 			} else {
 				if (yych <= 'y') {
 					if (yych <= 'x') goto yy56;
-					goto yy1138;
+					goto yy1078;
 				} else {
-					if (yych == 0xC2) goto yy1132;
+					if (yych == 0xC2) goto yy1072;
 					goto yy56;
 				}
 			}
 		}
 	}
-yy1131:
+yy1071:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= 'N') {
-			if (yych == 'I') goto yy1215;
+			if (yych == 'I') goto yy1155;
 			goto yy56;
 		} else {
-			if (yych <= 'O') goto yy1214;
+			if (yych <= 'O') goto yy1154;
 			if (yych <= 'R') goto yy56;
-			goto yy1216;
+			goto yy1156;
 		}
 	} else {
 		if (yych <= 'n') {
-			if (yych == 'i') goto yy1215;
+			if (yych == 'i') goto yy1155;
 			goto yy56;
 		} else {
-			if (yych <= 'o') goto yy1214;
-			if (yych == 's') goto yy1216;
+			if (yych <= 'o') goto yy1154;
+			if (yych == 's') goto yy1156;
 			goto yy56;
 		}
 	}
-yy1132:
+yy1072:
 	yych = *++YYCURSOR;
-	if (yych == 0xB5) goto yy1211;
+	if (yych == 0xB5) goto yy1151;
 	goto yy56;
-yy1133:
+yy1073:
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1209;
-	if (yych == 's') goto yy1209;
+	if (yych == 'S') goto yy1149;
+	if (yych == 's') goto yy1149;
 	goto yy56;
-yy1134:
+yy1074:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych <= 'D') {
-			if (yych == 'A') goto yy1196;
+			if (yych == 'A') goto yy1136;
 			goto yy56;
 		} else {
-			if (yych <= 'E') goto yy1197;
+			if (yych <= 'E') goto yy1137;
 			if (yych <= 'T') goto yy56;
-			goto yy1195;
+			goto yy1135;
 		}
 	} else {
 		if (yych <= 'd') {
-			if (yych == 'a') goto yy1196;
+			if (yych == 'a') goto yy1136;
 			goto yy56;
 		} else {
-			if (yych <= 'e') goto yy1197;
-			if (yych == 'u') goto yy1195;
+			if (yych <= 'e') goto yy1137;
+			if (yych == 'u') goto yy1135;
 			goto yy56;
 		}
 	}
-yy1135:
+yy1075:
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy1193;
-	if (yych == 'o') goto yy1193;
+	if (yych == 'O') goto yy1133;
+	if (yych == 'o') goto yy1133;
 	goto yy56;
-yy1136:
+yy1076:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1192;
-	if (yych == 'a') goto yy1192;
+	if (yych == 'A') goto yy1132;
+	if (yych == 'a') goto yy1132;
 	goto yy56;
-yy1137:
+yy1077:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
-		if (yych == 'O') goto yy1177;
+		if (yych == 'O') goto yy1117;
 		if (yych <= 'Q') goto yy56;
-		goto yy1176;
+		goto yy1116;
 	} else {
 		if (yych <= 'o') {
 			if (yych <= 'n') goto yy56;
-			goto yy1177;
+			goto yy1117;
 		} else {
-			if (yych == 'r') goto yy1176;
+			if (yych == 'r') goto yy1116;
 			goto yy56;
 		}
 	}
-yy1138:
+yy1078:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1173;
-	if (yych == 'e') goto yy1173;
+	if (yych == 'E') goto yy1113;
+	if (yych == 'e') goto yy1113;
 	goto yy56;
-yy1139:
+yy1079:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1159;
-	if (yych == 'e') goto yy1159;
+	if (yych == 'E') goto yy1099;
+	if (yych == 'e') goto yy1099;
 	goto yy56;
-yy1140:
+yy1080:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'H') goto yy1141;
+		if (yych == 'H') goto yy1081;
 		if (yych <= 'T') goto yy56;
-		goto yy1142;
+		goto yy1082;
 	} else {
 		if (yych <= 'h') {
 			if (yych <= 'g') goto yy56;
 		} else {
-			if (yych == 'u') goto yy1142;
+			if (yych == 'u') goto yy1082;
 			goto yy56;
 		}
 	}
-yy1141:
+yy1081:
 	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy1154;
-	if (yych == 'u') goto yy1154;
+	if (yych == 'U') goto yy1094;
+	if (yych == 'u') goto yy1094;
 	goto yy56;
-yy1142:
+yy1082:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1143;
+	if (yych == 'E') goto yy1083;
 	if (yych != 'e') goto yy56;
-yy1143:
-	yyaccept = 26;
+yy1083:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1145;
-		if (yych >= ' ') goto yy1145;
+		if (yych == '\t') goto yy1085;
+		if (yych >= ' ') goto yy1085;
 	} else {
 		if (yych <= 'S') {
-			if (yych >= 'S') goto yy1147;
+			if (yych >= 'S') goto yy1087;
 		} else {
-			if (yych == 's') goto yy1147;
+			if (yych == 's') goto yy1087;
 		}
 	}
-yy1144:
+yy1084:
 #line 1646 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
@@ -16357,47 +15453,47 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 16361 "ext/date/lib/parse_date.c"
-yy1145:
+#line 15457 "ext/date/lib/parse_date.c"
+yy1085:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1145;
+		if (yych == '\t') goto yy1085;
 		if (yych <= 0x1F) goto yy56;
-		goto yy1145;
+		goto yy1085;
 	} else {
 		if (yych <= 'O') {
 			if (yych <= 'N') goto yy56;
-			goto yy1151;
+			goto yy1091;
 		} else {
-			if (yych == 'o') goto yy1151;
+			if (yych == 'o') goto yy1091;
 			goto yy56;
 		}
 	}
-yy1147:
+yy1087:
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy1148;
+	if (yych == 'D') goto yy1088;
 	if (yych != 'd') goto yy56;
-yy1148:
+yy1088:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1149;
+	if (yych == 'A') goto yy1089;
 	if (yych != 'a') goto yy56;
-yy1149:
+yy1089:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1150;
+	if (yych == 'Y') goto yy1090;
 	if (yych != 'y') goto yy56;
-yy1150:
-	yyaccept = 26;
+yy1090:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '\t') goto yy1145;
-	if (yych == ' ') goto yy1145;
-	goto yy1144;
-yy1151:
+	if (yych == '\t') goto yy1085;
+	if (yych == ' ') goto yy1085;
+	goto yy1084;
+yy1091:
 	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy1152;
+	if (yych == 'F') goto yy1092;
 	if (yych != 'f') goto yy56;
-yy1152:
+yy1092:
 	++YYCURSOR;
 #line 1119 "ext/date/lib/parse_date.re"
 	{
@@ -16420,99 +15516,99 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEK_DAY_OF_MONTH;
 	}
-#line 16424 "ext/date/lib/parse_date.c"
-yy1154:
-	yyaccept = 26;
+#line 15520 "ext/date/lib/parse_date.c"
+yy1094:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1145;
-		if (yych <= 0x1F) goto yy1144;
-		goto yy1145;
+		if (yych == '\t') goto yy1085;
+		if (yych <= 0x1F) goto yy1084;
+		goto yy1085;
 	} else {
 		if (yych <= 'R') {
-			if (yych <= 'Q') goto yy1144;
+			if (yych <= 'Q') goto yy1084;
 		} else {
-			if (yych != 'r') goto yy1144;
+			if (yych != 'r') goto yy1084;
 		}
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1156;
+	if (yych == 'S') goto yy1096;
 	if (yych != 's') goto yy56;
-yy1156:
+yy1096:
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy1157;
+	if (yych == 'D') goto yy1097;
 	if (yych != 'd') goto yy56;
-yy1157:
+yy1097:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1158;
+	if (yych == 'A') goto yy1098;
 	if (yych != 'a') goto yy56;
-yy1158:
+yy1098:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1150;
-	if (yych == 'y') goto yy1150;
+	if (yych == 'Y') goto yy1090;
+	if (yych == 'y') goto yy1090;
 	goto yy56;
-yy1159:
+yy1099:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= 'C') goto yy56;
-		if (yych <= 'D') goto yy1161;
+		if (yych <= 'D') goto yy1101;
 	} else {
 		if (yych <= 'c') goto yy56;
-		if (yych <= 'd') goto yy1161;
+		if (yych <= 'd') goto yy1101;
 		if (yych >= 'f') goto yy56;
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'K') goto yy1167;
-	if (yych == 'k') goto yy1167;
+	if (yych == 'K') goto yy1107;
+	if (yych == 'k') goto yy1107;
 	goto yy56;
-yy1161:
-	yyaccept = 26;
+yy1101:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1145;
-		if (yych <= 0x1F) goto yy1144;
-		goto yy1145;
+		if (yych == '\t') goto yy1085;
+		if (yych <= 0x1F) goto yy1084;
+		goto yy1085;
 	} else {
 		if (yych <= 'N') {
-			if (yych <= 'M') goto yy1144;
+			if (yych <= 'M') goto yy1084;
 		} else {
-			if (yych != 'n') goto yy1144;
+			if (yych != 'n') goto yy1084;
 		}
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1163;
+	if (yych == 'E') goto yy1103;
 	if (yych != 'e') goto yy56;
-yy1163:
+yy1103:
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1164;
+	if (yych == 'S') goto yy1104;
 	if (yych != 's') goto yy56;
-yy1164:
+yy1104:
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy1165;
+	if (yych == 'D') goto yy1105;
 	if (yych != 'd') goto yy56;
-yy1165:
+yy1105:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1166;
+	if (yych == 'A') goto yy1106;
 	if (yych != 'a') goto yy56;
-yy1166:
+yy1106:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1150;
-	if (yych == 'y') goto yy1150;
+	if (yych == 'Y') goto yy1090;
+	if (yych == 'y') goto yy1090;
 	goto yy56;
-yy1167:
-	yyaccept = 27;
+yy1107:
+	yyaccept = 26;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
-		if (yych == 'D') goto yy1170;
-		if (yych >= 'S') goto yy1169;
+		if (yych == 'D') goto yy1110;
+		if (yych >= 'S') goto yy1109;
 	} else {
 		if (yych <= 'd') {
-			if (yych >= 'd') goto yy1170;
+			if (yych >= 'd') goto yy1110;
 		} else {
-			if (yych == 's') goto yy1169;
+			if (yych == 's') goto yy1109;
 		}
 	}
-yy1168:
+yy1108:
 #line 1622 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
@@ -16536,412 +15632,412 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 16540 "ext/date/lib/parse_date.c"
-yy1169:
+#line 15636 "ext/date/lib/parse_date.c"
+yy1109:
 	yych = *++YYCURSOR;
-	goto yy1144;
-yy1170:
+	goto yy1084;
+yy1110:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1171;
+	if (yych == 'A') goto yy1111;
 	if (yych != 'a') goto yy56;
-yy1171:
+yy1111:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1172;
+	if (yych == 'Y') goto yy1112;
 	if (yych != 'y') goto yy56;
-yy1172:
+yy1112:
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1169;
-	if (yych == 's') goto yy1169;
-	goto yy1144;
-yy1173:
+	if (yych == 'S') goto yy1109;
+	if (yych == 's') goto yy1109;
+	goto yy1084;
+yy1113:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1174;
+	if (yych == 'A') goto yy1114;
 	if (yych != 'a') goto yy56;
-yy1174:
+yy1114:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy1175;
+	if (yych == 'R') goto yy1115;
 	if (yych != 'r') goto yy56;
-yy1175:
+yy1115:
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1169;
-	if (yych == 's') goto yy1169;
-	goto yy1144;
-yy1176:
+	if (yych == 'S') goto yy1109;
+	if (yych == 's') goto yy1109;
+	goto yy1084;
+yy1116:
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy1189;
-	if (yych == 'i') goto yy1189;
+	if (yych == 'I') goto yy1129;
+	if (yych == 'i') goto yy1129;
 	goto yy56;
-yy1177:
+yy1117:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy1178;
+	if (yych == 'R') goto yy1118;
 	if (yych != 'r') goto yy56;
-yy1178:
+yy1118:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1179;
+	if (yych == 'T') goto yy1119;
 	if (yych != 't') goto yy56;
-yy1179:
+yy1119:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'H') goto yy1181;
+		if (yych == 'H') goto yy1121;
 		if (yych <= 'M') goto yy56;
 	} else {
 		if (yych <= 'h') {
 			if (yych <= 'g') goto yy56;
-			goto yy1181;
+			goto yy1121;
 		} else {
 			if (yych != 'n') goto yy56;
 		}
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy1186;
-	if (yych == 'i') goto yy1186;
+	if (yych == 'I') goto yy1126;
+	if (yych == 'i') goto yy1126;
 	goto yy56;
-yy1181:
+yy1121:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy1182;
+	if (yych == 'N') goto yy1122;
 	if (yych != 'n') goto yy56;
-yy1182:
+yy1122:
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy1183;
+	if (yych == 'I') goto yy1123;
 	if (yych != 'i') goto yy56;
-yy1183:
+yy1123:
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy1184;
+	if (yych == 'G') goto yy1124;
 	if (yych != 'g') goto yy56;
-yy1184:
+yy1124:
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy1185;
+	if (yych == 'H') goto yy1125;
 	if (yych != 'h') goto yy56;
-yy1185:
+yy1125:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1175;
-	if (yych == 't') goto yy1175;
+	if (yych == 'T') goto yy1115;
+	if (yych == 't') goto yy1115;
 	goto yy56;
-yy1186:
+yy1126:
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy1187;
+	if (yych == 'G') goto yy1127;
 	if (yych != 'g') goto yy56;
-yy1187:
+yy1127:
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy1188;
+	if (yych == 'H') goto yy1128;
 	if (yych != 'h') goto yy56;
-yy1188:
+yy1128:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1175;
-	if (yych == 't') goto yy1175;
+	if (yych == 'T') goto yy1115;
+	if (yych == 't') goto yy1115;
 	goto yy56;
-yy1189:
-	yyaccept = 26;
+yy1129:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1145;
-		if (yych <= 0x1F) goto yy1144;
-		goto yy1145;
+		if (yych == '\t') goto yy1085;
+		if (yych <= 0x1F) goto yy1084;
+		goto yy1085;
 	} else {
 		if (yych <= 'D') {
-			if (yych <= 'C') goto yy1144;
+			if (yych <= 'C') goto yy1084;
 		} else {
-			if (yych != 'd') goto yy1144;
+			if (yych != 'd') goto yy1084;
 		}
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1191;
+	if (yych == 'A') goto yy1131;
 	if (yych != 'a') goto yy56;
-yy1191:
+yy1131:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1150;
-	if (yych == 'y') goto yy1150;
+	if (yych == 'Y') goto yy1090;
+	if (yych == 'y') goto yy1090;
 	goto yy56;
-yy1192:
+yy1132:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1175;
-	if (yych == 'y') goto yy1175;
+	if (yych == 'Y') goto yy1115;
+	if (yych == 'y') goto yy1115;
 	goto yy56;
-yy1193:
+yy1133:
 	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy1194;
+	if (yych == 'U') goto yy1134;
 	if (yych != 'u') goto yy56;
-yy1194:
+yy1134:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy1175;
-	if (yych == 'r') goto yy1175;
+	if (yych == 'R') goto yy1115;
+	if (yych == 'r') goto yy1115;
 	goto yy56;
-yy1195:
+yy1135:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy1206;
-	if (yych == 'n') goto yy1206;
+	if (yych == 'N') goto yy1146;
+	if (yych == 'n') goto yy1146;
 	goto yy56;
-yy1196:
+yy1136:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1201;
-	if (yych == 't') goto yy1201;
+	if (yych == 'T') goto yy1141;
+	if (yych == 't') goto yy1141;
 	goto yy56;
-yy1197:
+yy1137:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy1198;
+	if (yych == 'C') goto yy1138;
 	if (yych != 'c') goto yy56;
-yy1198:
-	yyaccept = 26;
+yy1138:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
-		if (yych == 'O') goto yy1199;
-		if (yych <= 'R') goto yy1144;
-		goto yy1169;
+		if (yych == 'O') goto yy1139;
+		if (yych <= 'R') goto yy1084;
+		goto yy1109;
 	} else {
 		if (yych <= 'o') {
-			if (yych <= 'n') goto yy1144;
+			if (yych <= 'n') goto yy1084;
 		} else {
-			if (yych == 's') goto yy1169;
-			goto yy1144;
+			if (yych == 's') goto yy1109;
+			goto yy1084;
 		}
 	}
-yy1199:
+yy1139:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy1200;
+	if (yych == 'N') goto yy1140;
 	if (yych != 'n') goto yy56;
-yy1200:
+yy1140:
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy1175;
-	if (yych == 'd') goto yy1175;
+	if (yych == 'D') goto yy1115;
+	if (yych == 'd') goto yy1115;
 	goto yy56;
-yy1201:
-	yyaccept = 26;
+yy1141:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1145;
-		if (yych <= 0x1F) goto yy1144;
-		goto yy1145;
+		if (yych == '\t') goto yy1085;
+		if (yych <= 0x1F) goto yy1084;
+		goto yy1085;
 	} else {
 		if (yych <= 'U') {
-			if (yych <= 'T') goto yy1144;
+			if (yych <= 'T') goto yy1084;
 		} else {
-			if (yych != 'u') goto yy1144;
+			if (yych != 'u') goto yy1084;
 		}
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy1203;
+	if (yych == 'R') goto yy1143;
 	if (yych != 'r') goto yy56;
-yy1203:
+yy1143:
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy1204;
+	if (yych == 'D') goto yy1144;
 	if (yych != 'd') goto yy56;
-yy1204:
+yy1144:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1205;
+	if (yych == 'A') goto yy1145;
 	if (yych != 'a') goto yy56;
-yy1205:
+yy1145:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1150;
-	if (yych == 'y') goto yy1150;
+	if (yych == 'Y') goto yy1090;
+	if (yych == 'y') goto yy1090;
 	goto yy56;
-yy1206:
-	yyaccept = 26;
+yy1146:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1145;
-		if (yych <= 0x1F) goto yy1144;
-		goto yy1145;
+		if (yych == '\t') goto yy1085;
+		if (yych <= 0x1F) goto yy1084;
+		goto yy1085;
 	} else {
 		if (yych <= 'D') {
-			if (yych <= 'C') goto yy1144;
+			if (yych <= 'C') goto yy1084;
 		} else {
-			if (yych != 'd') goto yy1144;
+			if (yych != 'd') goto yy1084;
 		}
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1208;
+	if (yych == 'A') goto yy1148;
 	if (yych != 'a') goto yy56;
-yy1208:
+yy1148:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1150;
-	if (yych == 'y') goto yy1150;
+	if (yych == 'Y') goto yy1090;
+	if (yych == 'y') goto yy1090;
 	goto yy56;
-yy1209:
+yy1149:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1210;
+	if (yych == 'E') goto yy1150;
 	if (yych != 'e') goto yy56;
-yy1210:
+yy1150:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy1175;
-	if (yych == 'c') goto yy1175;
+	if (yych == 'C') goto yy1115;
+	if (yych == 'c') goto yy1115;
 	goto yy56;
-yy1211:
+yy1151:
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1212;
+	if (yych == 'S') goto yy1152;
 	if (yych != 's') goto yy56;
-yy1212:
-	yyaccept = 26;
+yy1152:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy1213;
-	if (yych != 'e') goto yy1144;
-yy1213:
+	if (yych == 'E') goto yy1153;
+	if (yych != 'e') goto yy1084;
+yy1153:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy1175;
-	if (yych == 'c') goto yy1175;
+	if (yych == 'C') goto yy1115;
+	if (yych == 'c') goto yy1115;
 	goto yy56;
-yy1214:
+yy1154:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy1237;
-	if (yych == 'n') goto yy1237;
+	if (yych == 'N') goto yy1177;
+	if (yych == 'n') goto yy1177;
 	goto yy56;
-yy1215:
+yy1155:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= 'K') {
-			if (yych == 'C') goto yy1219;
+			if (yych == 'C') goto yy1159;
 			goto yy56;
 		} else {
-			if (yych <= 'L') goto yy1218;
+			if (yych <= 'L') goto yy1158;
 			if (yych <= 'M') goto yy56;
-			goto yy1220;
+			goto yy1160;
 		}
 	} else {
 		if (yych <= 'k') {
-			if (yych == 'c') goto yy1219;
+			if (yych == 'c') goto yy1159;
 			goto yy56;
 		} else {
-			if (yych <= 'l') goto yy1218;
-			if (yych == 'n') goto yy1220;
+			if (yych <= 'l') goto yy1158;
+			if (yych == 'n') goto yy1160;
 			goto yy56;
 		}
 	}
-yy1216:
-	yyaccept = 26;
+yy1156:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy1217;
-	if (yych != 'e') goto yy1144;
-yy1217:
+	if (yych == 'E') goto yy1157;
+	if (yych != 'e') goto yy1084;
+yy1157:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy1175;
-	if (yych == 'c') goto yy1175;
+	if (yych == 'C') goto yy1115;
+	if (yych == 'c') goto yy1115;
 	goto yy56;
-yy1218:
+yy1158:
 	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy1230;
-	if (yych == 'l') goto yy1230;
+	if (yych == 'L') goto yy1170;
+	if (yych == 'l') goto yy1170;
 	goto yy56;
-yy1219:
+yy1159:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy1223;
-	if (yych == 'r') goto yy1223;
+	if (yych == 'R') goto yy1163;
+	if (yych == 'r') goto yy1163;
 	goto yy56;
-yy1220:
-	yyaccept = 26;
+yy1160:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'U') {
-		if (yych == 'S') goto yy1169;
-		if (yych <= 'T') goto yy1144;
+		if (yych == 'S') goto yy1109;
+		if (yych <= 'T') goto yy1084;
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'r') goto yy1144;
-			goto yy1169;
+			if (yych <= 'r') goto yy1084;
+			goto yy1109;
 		} else {
-			if (yych != 'u') goto yy1144;
+			if (yych != 'u') goto yy1084;
 		}
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1222;
+	if (yych == 'T') goto yy1162;
 	if (yych != 't') goto yy56;
-yy1222:
+yy1162:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1175;
-	if (yych == 'e') goto yy1175;
+	if (yych == 'E') goto yy1115;
+	if (yych == 'e') goto yy1115;
 	goto yy56;
-yy1223:
+yy1163:
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy1224;
+	if (yych == 'O') goto yy1164;
 	if (yych != 'o') goto yy56;
-yy1224:
+yy1164:
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1225;
+	if (yych == 'S') goto yy1165;
 	if (yych != 's') goto yy56;
-yy1225:
+yy1165:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1226;
+	if (yych == 'E') goto yy1166;
 	if (yych != 'e') goto yy56;
-yy1226:
+yy1166:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy1227;
+	if (yych == 'C') goto yy1167;
 	if (yych != 'c') goto yy56;
-yy1227:
+yy1167:
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy1228;
+	if (yych == 'O') goto yy1168;
 	if (yych != 'o') goto yy56;
-yy1228:
+yy1168:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy1229;
+	if (yych == 'N') goto yy1169;
 	if (yych != 'n') goto yy56;
-yy1229:
+yy1169:
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy1175;
-	if (yych == 'd') goto yy1175;
+	if (yych == 'D') goto yy1115;
+	if (yych == 'd') goto yy1115;
 	goto yy56;
-yy1230:
+yy1170:
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy1231;
+	if (yych == 'I') goto yy1171;
 	if (yych != 'i') goto yy56;
-yy1231:
+yy1171:
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1232;
+	if (yych == 'S') goto yy1172;
 	if (yych != 's') goto yy56;
-yy1232:
+yy1172:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1233;
+	if (yych == 'E') goto yy1173;
 	if (yych != 'e') goto yy56;
-yy1233:
+yy1173:
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy1234;
+	if (yych == 'C') goto yy1174;
 	if (yych != 'c') goto yy56;
-yy1234:
+yy1174:
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy1235;
+	if (yych == 'O') goto yy1175;
 	if (yych != 'o') goto yy56;
-yy1235:
+yy1175:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy1236;
+	if (yych == 'N') goto yy1176;
 	if (yych != 'n') goto yy56;
-yy1236:
+yy1176:
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy1175;
-	if (yych == 'd') goto yy1175;
+	if (yych == 'D') goto yy1115;
+	if (yych == 'd') goto yy1115;
 	goto yy56;
-yy1237:
-	yyaccept = 26;
+yy1177:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1145;
-			goto yy1144;
+			if (yych == '\t') goto yy1085;
+			goto yy1084;
 		} else {
-			if (yych <= ' ') goto yy1145;
-			if (yych <= 'C') goto yy1144;
+			if (yych <= ' ') goto yy1085;
+			if (yych <= 'C') goto yy1084;
 		}
 	} else {
 		if (yych <= 'c') {
-			if (yych == 'T') goto yy1239;
-			goto yy1144;
+			if (yych == 'T') goto yy1179;
+			goto yy1084;
 		} else {
-			if (yych <= 'd') goto yy1238;
-			if (yych == 't') goto yy1239;
-			goto yy1144;
+			if (yych <= 'd') goto yy1178;
+			if (yych == 't') goto yy1179;
+			goto yy1084;
 		}
 	}
-yy1238:
+yy1178:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1240;
-	if (yych == 'a') goto yy1240;
+	if (yych == 'A') goto yy1180;
+	if (yych == 'a') goto yy1180;
 	goto yy56;
-yy1239:
+yy1179:
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy1175;
-	if (yych == 'h') goto yy1175;
+	if (yych == 'H') goto yy1115;
+	if (yych == 'h') goto yy1115;
 	goto yy56;
-yy1240:
+yy1180:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1150;
-	if (yych == 'y') goto yy1150;
+	if (yych == 'Y') goto yy1090;
+	if (yych == 'y') goto yy1090;
 	goto yy56;
-yy1241:
+yy1181:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -16956,7 +16052,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy1123;
+			if (yych <= 'E') goto yy1063;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -16965,13 +16061,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'e') goto yy1242;
+				if (yych <= 'e') goto yy1182;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1242:
+yy1182:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'U') {
@@ -16986,7 +16082,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'V') goto yy1124;
+			if (yych <= 'V') goto yy1064;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -16995,13 +16091,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 'v') goto yy1243;
+				if (yych <= 'v') goto yy1183;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1243:
+yy1183:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'H') {
@@ -17016,7 +16112,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'I') goto yy1125;
+			if (yych <= 'I') goto yy1065;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -17025,13 +16121,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'i') goto yy1244;
+				if (yych <= 'i') goto yy1184;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1244:
+yy1184:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
@@ -17046,7 +16142,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'O') goto yy1126;
+			if (yych <= 'O') goto yy1066;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -17055,13 +16151,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'o') goto yy1245;
+				if (yych <= 'o') goto yy1185;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1245:
+yy1185:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
@@ -17075,18 +16171,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'U') goto yy1127;
+			if (yych <= 'U') goto yy1067;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 'u') goto yy1246;
+			if (yych == 'u') goto yy1186;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy1246:
+yy1186:
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1128;
+	if (yych == 'S') goto yy1068;
 	if (yych != 's') goto yy179;
 	yych = *++YYCURSOR;
 	if (yybm[0+yych] & 16) {
@@ -17095,9 +16191,9 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	if (yych <= ',') {
 		if (yych <= '\t') {
 			if (yych <= 0x08) goto yy56;
-			goto yy1129;
+			goto yy1069;
 		} else {
-			if (yych == ' ') goto yy1129;
+			if (yych == ' ') goto yy1069;
 			goto yy56;
 		}
 	} else {
@@ -17109,7 +16205,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy56;
 		}
 	}
-yy1248:
+yy1188:
 	yych = *++YYCURSOR;
 	if (yych <= 'G') {
 		if (yych <= ')') {
@@ -17118,7 +16214,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'F') goto yy166;
-			goto yy1262;
+			goto yy1202;
 		}
 	} else {
 		if (yych <= 'f') {
@@ -17126,12 +16222,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'g') goto yy1262;
+			if (yych <= 'g') goto yy1202;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1249:
+yy1189:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -17147,12 +16243,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'e') goto yy1250;
+			if (yych <= 'e') goto yy1190;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1250:
+yy1190:
 	yych = *++YYCURSOR;
 	if (yych <= 'V') {
 		if (yych <= ')') {
@@ -17168,12 +16264,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'v') goto yy1251;
+			if (yych <= 'v') goto yy1191;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1251:
+yy1191:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -17189,12 +16285,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'e') goto yy1252;
+			if (yych <= 'e') goto yy1192;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1252:
+yy1192:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -17210,63 +16306,63 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'n') goto yy1253;
+			if (yych <= 'n') goto yy1193;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1253:
+yy1193:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'T') goto yy1254;
+		if (yych <= 'T') goto yy1194;
 		if (yych != 't') goto yy3;
 	}
-yy1254:
+yy1194:
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy1255;
+	if (yych == 'H') goto yy1195;
 	if (yych != 'h') goto yy56;
-yy1255:
+yy1195:
 	yych = *++YYCURSOR;
-	if (yych == '\t') goto yy1256;
+	if (yych == '\t') goto yy1196;
 	if (yych != ' ') goto yy56;
-yy1256:
+yy1196:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
 	yych = *YYCURSOR;
-yy1257:
+yy1197:
 	if (yych <= 'X') {
 		if (yych <= 'G') {
 			if (yych <= ' ') {
-				if (yych == '\t') goto yy1256;
+				if (yych == '\t') goto yy1196;
 				if (yych <= 0x1F) goto yy56;
-				goto yy1256;
+				goto yy1196;
 			} else {
 				if (yych <= 'D') {
 					if (yych <= 'C') goto yy56;
-					goto yy1136;
+					goto yy1076;
 				} else {
-					if (yych == 'F') goto yy1137;
+					if (yych == 'F') goto yy1077;
 					goto yy56;
 				}
 			}
 		} else {
 			if (yych <= 'S') {
 				if (yych <= 'L') {
-					if (yych <= 'H') goto yy1135;
+					if (yych <= 'H') goto yy1075;
 					goto yy56;
 				} else {
-					if (yych <= 'M') goto yy1131;
+					if (yych <= 'M') goto yy1071;
 					if (yych <= 'R') goto yy56;
-					goto yy1134;
+					goto yy1074;
 				}
 			} else {
 				if (yych <= 'U') {
-					if (yych <= 'T') goto yy1140;
-					goto yy1133;
+					if (yych <= 'T') goto yy1080;
+					goto yy1073;
 				} else {
 					if (yych != 'W') goto yy56;
 				}
@@ -17276,74 +16372,74 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych <= 'r') {
 			if (yych <= 'f') {
 				if (yych <= 'c') {
-					if (yych <= 'Y') goto yy1138;
+					if (yych <= 'Y') goto yy1078;
 					goto yy56;
 				} else {
-					if (yych <= 'd') goto yy1136;
+					if (yych <= 'd') goto yy1076;
 					if (yych <= 'e') goto yy56;
-					goto yy1137;
+					goto yy1077;
 				}
 			} else {
 				if (yych <= 'h') {
 					if (yych <= 'g') goto yy56;
-					goto yy1135;
+					goto yy1075;
 				} else {
-					if (yych == 'm') goto yy1131;
+					if (yych == 'm') goto yy1071;
 					goto yy56;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 't') {
-					if (yych <= 's') goto yy1134;
-					goto yy1140;
+					if (yych <= 's') goto yy1074;
+					goto yy1080;
 				} else {
-					if (yych <= 'u') goto yy1133;
+					if (yych <= 'u') goto yy1073;
 					if (yych <= 'v') goto yy56;
 				}
 			} else {
 				if (yych <= 'y') {
 					if (yych <= 'x') goto yy56;
-					goto yy1138;
+					goto yy1078;
 				} else {
-					if (yych == 0xC2) goto yy1132;
+					if (yych == 0xC2) goto yy1072;
 					goto yy56;
 				}
 			}
 		}
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1259;
+	if (yych == 'E') goto yy1199;
 	if (yych != 'e') goto yy56;
-yy1259:
+yy1199:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= 'C') goto yy56;
-		if (yych <= 'D') goto yy1161;
+		if (yych <= 'D') goto yy1101;
 	} else {
 		if (yych <= 'c') goto yy56;
-		if (yych <= 'd') goto yy1161;
+		if (yych <= 'd') goto yy1101;
 		if (yych >= 'f') goto yy56;
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'K') goto yy1261;
+	if (yych == 'K') goto yy1201;
 	if (yych != 'k') goto yy56;
-yy1261:
+yy1201:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
-		if (yych == 'D') goto yy1170;
+		if (yych == 'D') goto yy1110;
 		if (yych <= 'R') goto yy56;
-		goto yy1169;
+		goto yy1109;
 	} else {
 		if (yych <= 'd') {
 			if (yych <= 'c') goto yy56;
-			goto yy1170;
+			goto yy1110;
 		} else {
-			if (yych == 's') goto yy1169;
+			if (yych == 's') goto yy1109;
 			goto yy56;
 		}
 	}
-yy1262:
+yy1202:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -17359,12 +16455,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'h') goto yy1263;
+			if (yych <= 'h') goto yy1203;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1263:
+yy1203:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -17380,46 +16476,46 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 't') goto yy1264;
+			if (yych <= 't') goto yy1204;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1264:
+yy1204:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1256;
+			if (yych == '\t') goto yy1196;
 			goto yy3;
 		} else {
-			if (yych <= ' ') goto yy1256;
+			if (yych <= ' ') goto yy1196;
 			if (yych == ')') goto yy164;
 			goto yy3;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych == 'H') goto yy1265;
+			if (yych == 'H') goto yy1205;
 			if (yych <= 'Z') goto yy169;
 			goto yy3;
 		} else {
-			if (yych == 'h') goto yy1265;
+			if (yych == 'h') goto yy1205;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1265:
+yy1205:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy1256;
+		if (yych == '\t') goto yy1196;
 		goto yy3;
 	} else {
-		if (yych <= ' ') goto yy1256;
+		if (yych <= ' ') goto yy1196;
 		if (yych == ')') goto yy164;
 		goto yy3;
 	}
-yy1266:
+yy1206:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'F') {
@@ -17434,7 +16530,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'G') goto yy1262;
+			if (yych <= 'G') goto yy1202;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -17443,13 +16539,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'g') goto yy1274;
+				if (yych <= 'g') goto yy1214;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1267:
+yy1207:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -17464,7 +16560,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy1250;
+			if (yych <= 'E') goto yy1190;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -17473,13 +16569,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'e') goto yy1268;
+				if (yych <= 'e') goto yy1208;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1268:
+yy1208:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'U') {
@@ -17494,7 +16590,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'V') goto yy1251;
+			if (yych <= 'V') goto yy1191;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -17503,13 +16599,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 'v') goto yy1269;
+				if (yych <= 'v') goto yy1209;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1269:
+yy1209:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -17524,7 +16620,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy1252;
+			if (yych <= 'E') goto yy1192;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -17533,13 +16629,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'e') goto yy1270;
+				if (yych <= 'e') goto yy1210;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1270:
+yy1210:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -17554,7 +16650,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1253;
+			if (yych <= 'N') goto yy1193;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -17563,13 +16659,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'n') goto yy1271;
+				if (yych <= 'n') goto yy1211;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1271:
+yy1211:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -17583,20 +16679,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'T') goto yy1254;
+			if (yych <= 'T') goto yy1194;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 't') goto yy1272;
+			if (yych == 't') goto yy1212;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy1272:
+yy1212:
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy1255;
+	if (yych == 'H') goto yy1195;
 	if (yych != 'h') goto yy179;
-yy1273:
+yy1213:
 	yych = *++YYCURSOR;
 	if (yybm[0+yych] & 16) {
 		goto yy178;
@@ -17604,9 +16700,9 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	if (yych <= ',') {
 		if (yych <= '\t') {
 			if (yych <= 0x08) goto yy56;
-			goto yy1256;
+			goto yy1196;
 		} else {
-			if (yych == ' ') goto yy1256;
+			if (yych == ' ') goto yy1196;
 			goto yy56;
 		}
 	} else {
@@ -17618,7 +16714,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy56;
 		}
 	}
-yy1274:
+yy1214:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -17633,7 +16729,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'H') goto yy1263;
+			if (yych <= 'H') goto yy1203;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -17642,13 +16738,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 'h') goto yy1275;
+				if (yych <= 'h') goto yy1215;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1275:
+yy1215:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -17663,7 +16759,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1264;
+			if (yych <= 'T') goto yy1204;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -17672,22 +16768,22 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 't') goto yy1276;
+				if (yych <= 't') goto yy1216;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1276:
+yy1216:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
 				if (yych <= 0x08) goto yy3;
-				goto yy1256;
+				goto yy1196;
 			} else {
-				if (yych == ' ') goto yy1256;
+				if (yych == ' ') goto yy1196;
 				goto yy3;
 			}
 		} else {
@@ -17705,7 +16801,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy3;
 				goto yy169;
 			} else {
-				if (yych <= 'H') goto yy1265;
+				if (yych <= 'H') goto yy1205;
 				if (yych <= 'Z') goto yy169;
 				goto yy3;
 			}
@@ -17715,13 +16811,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'h') goto yy1277;
+				if (yych <= 'h') goto yy1217;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1277:
+yy1217:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 16) {
@@ -17729,10 +16825,10 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 	}
 	if (yych <= ')') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1256;
+			if (yych == '\t') goto yy1196;
 			goto yy3;
 		} else {
-			if (yych <= ' ') goto yy1256;
+			if (yych <= ' ') goto yy1196;
 			if (yych <= '(') goto yy3;
 			goto yy164;
 		}
@@ -17746,7 +16842,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy1278:
+yy1218:
 	yych = *++YYCURSOR;
 	if (yych <= 'V') {
 		if (yych <= 'B') {
@@ -17755,12 +16851,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy166;
 		} else {
 			if (yych <= 'O') {
-				if (yych <= 'C') goto yy1294;
+				if (yych <= 'C') goto yy1234;
 				goto yy166;
 			} else {
-				if (yych <= 'P') goto yy1296;
+				if (yych <= 'P') goto yy1236;
 				if (yych <= 'U') goto yy166;
-				goto yy1295;
+				goto yy1235;
 			}
 		}
 	} else {
@@ -17769,21 +16865,21 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= 'Z') goto yy166;
 				goto yy3;
 			} else {
-				if (yych == 'c') goto yy1294;
+				if (yych == 'c') goto yy1234;
 				goto yy166;
 			}
 		} else {
 			if (yych <= 'u') {
-				if (yych <= 'p') goto yy1296;
+				if (yych <= 'p') goto yy1236;
 				goto yy166;
 			} else {
-				if (yych <= 'v') goto yy1295;
+				if (yych <= 'v') goto yy1235;
 				if (yych <= 'z') goto yy166;
 				goto yy3;
 			}
 		}
 	}
-yy1279:
+yy1219:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -17792,7 +16888,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'S') goto yy166;
-			goto yy1289;
+			goto yy1229;
 		}
 	} else {
 		if (yych <= 's') {
@@ -17800,12 +16896,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 't') goto yy1289;
+			if (yych <= 't') goto yy1229;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1280:
+yy1220:
 	yych = *++YYCURSOR;
 	if (yych <= 'X') {
 		if (yych <= ')') {
@@ -17814,7 +16910,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'W') goto yy166;
-			goto yy1286;
+			goto yy1226;
 		}
 	} else {
 		if (yych <= 'w') {
@@ -17822,12 +16918,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'x') goto yy1286;
+			if (yych <= 'x') goto yy1226;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1281:
+yy1221:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -17843,12 +16939,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'n') goto yy1282;
+			if (yych <= 'n') goto yy1222;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1282:
+yy1222:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -17864,12 +16960,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy191;
 			goto yy167;
 		} else {
-			if (yych <= 'd') goto yy1283;
+			if (yych <= 'd') goto yy1223;
 			if (yych <= 'z') goto yy167;
 			goto yy191;
 		}
 	}
-yy1283:
+yy1223:
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy164;
@@ -17879,12 +16975,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'Z') goto yy168;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1284;
+			if (yych <= 'a') goto yy1224;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1284:
+yy1224:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
 		if (yych <= ')') {
@@ -17900,16 +16996,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'y') goto yy1285;
+			if (yych <= 'y') goto yy1225;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1285:
+yy1225:
 	yych = *++YYCURSOR;
 	if (yych == ')') goto yy164;
 	goto yy191;
-yy1286:
+yy1226:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -17925,12 +17021,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 't') goto yy1287;
+			if (yych <= 't') goto yy1227;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1287:
+yy1227:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -17946,20 +17042,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'h') goto yy1288;
+			if (yych <= 'h') goto yy1228;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1288:
+yy1228:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '(') {
 		if (yych <= '\t') {
 			if (yych <= 0x08) goto yy3;
-			goto yy1256;
+			goto yy1196;
 		} else {
-			if (yych == ' ') goto yy1256;
+			if (yych == ' ') goto yy1196;
 			goto yy3;
 		}
 	} else {
@@ -17973,7 +17069,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy1289:
+yy1229:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych <= ')') {
@@ -17989,12 +17085,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy191;
 			goto yy167;
 		} else {
-			if (yych <= 'u') goto yy1290;
+			if (yych <= 'u') goto yy1230;
 			if (yych <= 'z') goto yy167;
 			goto yy191;
 		}
 	}
-yy1290:
+yy1230:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -18010,12 +17106,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'r') goto yy1291;
+			if (yych <= 'r') goto yy1231;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1291:
+yy1231:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -18031,27 +17127,27 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'd') goto yy1292;
+			if (yych <= 'd') goto yy1232;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1292:
+yy1232:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'A') goto yy1293;
+		if (yych <= 'A') goto yy1233;
 		if (yych != 'a') goto yy3;
 	}
-yy1293:
+yy1233:
 	yych = *++YYCURSOR;
 	if (yych == 'Y') goto yy197;
 	if (yych == 'y') goto yy197;
 	goto yy56;
-yy1294:
+yy1234:
 	yych = *++YYCURSOR;
 	if (yych <= 'O') {
 		if (yych <= ')') {
@@ -18060,7 +17156,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'N') goto yy167;
-			goto yy1305;
+			goto yy1245;
 		}
 	} else {
 		if (yych <= 'n') {
@@ -18068,12 +17164,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'o') goto yy1305;
+			if (yych <= 'o') goto yy1245;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1295:
+yy1235:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -18082,7 +17178,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'D') goto yy167;
-			goto yy1302;
+			goto yy1242;
 		}
 	} else {
 		if (yych <= 'd') {
@@ -18090,12 +17186,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'e') goto yy1302;
+			if (yych <= 'e') goto yy1242;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1296:
+yy1236:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -18130,13 +17226,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 't') goto yy1297;
+				if (yych <= 't') goto yy1237;
 				if (yych <= 'z') goto yy167;
 				goto yy218;
 			}
 		}
 	}
-yy1297:
+yy1237:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -18171,13 +17267,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy168;
 			} else {
-				if (yych <= 'e') goto yy1298;
+				if (yych <= 'e') goto yy1238;
 				if (yych <= 'z') goto yy168;
 				goto yy218;
 			}
 		}
 	}
-yy1298:
+yy1238:
 	yych = *++YYCURSOR;
 	if (yych <= 'M') {
 		if (yych <= ')') {
@@ -18193,31 +17289,31 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'm') goto yy1299;
+			if (yych <= 'm') goto yy1239;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1299:
+yy1239:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'A') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'B') goto yy1300;
+		if (yych <= 'B') goto yy1240;
 		if (yych != 'b') goto yy3;
 	}
-yy1300:
+yy1240:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1301;
+	if (yych == 'E') goto yy1241;
 	if (yych != 'e') goto yy56;
-yy1301:
+yy1241:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy230;
-	if (yych == 'r') goto yy230;
+	if (yych == 'R') goto yy229;
+	if (yych == 'r') goto yy229;
 	goto yy56;
-yy1302:
+yy1242:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -18233,12 +17329,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'n') goto yy1303;
+			if (yych <= 'n') goto yy1243;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1303:
+yy1243:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -18254,23 +17350,23 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 't') goto yy1304;
+			if (yych <= 't') goto yy1244;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1304:
+yy1244:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'H') goto yy1255;
-		if (yych == 'h') goto yy1255;
+		if (yych <= 'H') goto yy1195;
+		if (yych == 'h') goto yy1195;
 		goto yy3;
 	}
-yy1305:
+yy1245:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -18286,12 +17382,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'n') goto yy1306;
+			if (yych <= 'n') goto yy1246;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1306:
+yy1246:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -18300,7 +17396,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'C') goto yy169;
-			goto yy1265;
+			goto yy1205;
 		}
 	} else {
 		if (yych <= 'c') {
@@ -18308,12 +17404,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'd') goto yy1265;
+			if (yych <= 'd') goto yy1205;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1307:
+yy1247:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'U') {
@@ -18329,16 +17425,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'C') {
 				if (yych <= '@') goto yy3;
 				if (yych <= 'B') goto yy166;
-				goto yy1294;
+				goto yy1234;
 			} else {
-				if (yych == 'P') goto yy1296;
+				if (yych == 'P') goto yy1236;
 				goto yy166;
 			}
 		}
 	} else {
 		if (yych <= 'b') {
 			if (yych <= '^') {
-				if (yych <= 'V') goto yy1295;
+				if (yych <= 'V') goto yy1235;
 				if (yych <= 'Z') goto yy166;
 				goto yy3;
 			} else {
@@ -18348,17 +17444,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		} else {
 			if (yych <= 'p') {
-				if (yych <= 'c') goto yy1323;
+				if (yych <= 'c') goto yy1263;
 				if (yych <= 'o') goto yy171;
-				goto yy1325;
+				goto yy1265;
 			} else {
-				if (yych == 'v') goto yy1324;
+				if (yych == 'v') goto yy1264;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1308:
+yy1248:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -18373,7 +17469,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1289;
+			if (yych <= 'T') goto yy1229;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -18382,13 +17478,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 't') goto yy1318;
+				if (yych <= 't') goto yy1258;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1309:
+yy1249:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
@@ -18403,7 +17499,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'X') goto yy1286;
+			if (yych <= 'X') goto yy1226;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -18412,13 +17508,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'x') goto yy1315;
+				if (yych <= 'x') goto yy1255;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1310:
+yy1250:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -18433,7 +17529,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1282;
+			if (yych <= 'N') goto yy1222;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -18442,13 +17538,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'n') goto yy1311;
+				if (yych <= 'n') goto yy1251;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1311:
+yy1251:
 	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -18463,7 +17559,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1283;
+			if (yych <= 'D') goto yy1223;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy191;
 			goto yy172;
@@ -18472,13 +17568,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy191;
 				goto yy175;
 			} else {
-				if (yych <= 'd') goto yy1312;
+				if (yych <= 'd') goto yy1252;
 				if (yych <= 'z') goto yy175;
 				goto yy191;
 			}
 		}
 	}
-yy1312:
+yy1252:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -18492,18 +17588,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy1284;
+			if (yych <= 'A') goto yy1224;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1313;
+			if (yych <= 'a') goto yy1253;
 			if (yych <= 'z') goto yy176;
 			goto yy3;
 		}
 	}
-yy1313:
+yy1253:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -18518,7 +17614,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'Y') goto yy1285;
+			if (yych <= 'Y') goto yy1225;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -18527,13 +17623,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'y') goto yy1314;
+				if (yych <= 'y') goto yy1254;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1314:
+yy1254:
 	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 16) {
@@ -18552,7 +17648,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy191;
 		}
 	}
-yy1315:
+yy1255:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -18567,7 +17663,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1287;
+			if (yych <= 'T') goto yy1227;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -18576,13 +17672,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 't') goto yy1316;
+				if (yych <= 't') goto yy1256;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1316:
+yy1256:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -18597,7 +17693,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'H') goto yy1288;
+			if (yych <= 'H') goto yy1228;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -18606,20 +17702,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'h') goto yy1317;
+				if (yych <= 'h') goto yy1257;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1317:
+yy1257:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy1256;
+			if (yych == '\t') goto yy1196;
 			if (yych <= 0x1F) goto yy3;
-			goto yy1256;
+			goto yy1196;
 		} else {
 			if (yych == ')') goto yy164;
 			if (yych <= ',') goto yy3;
@@ -18641,7 +17737,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy1318:
+yy1258:
 	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
@@ -18656,7 +17752,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'U') goto yy1290;
+			if (yych <= 'U') goto yy1230;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy191;
 			goto yy172;
@@ -18665,13 +17761,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy191;
 				goto yy175;
 			} else {
-				if (yych <= 'u') goto yy1319;
+				if (yych <= 'u') goto yy1259;
 				if (yych <= 'z') goto yy175;
 				goto yy191;
 			}
 		}
 	}
-yy1319:
+yy1259:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -18686,7 +17782,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy1291;
+			if (yych <= 'R') goto yy1231;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -18695,13 +17791,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'r') goto yy1320;
+				if (yych <= 'r') goto yy1260;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1320:
+yy1260:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -18716,7 +17812,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1292;
+			if (yych <= 'D') goto yy1232;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -18725,13 +17821,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'd') goto yy1321;
+				if (yych <= 'd') goto yy1261;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1321:
+yy1261:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -18745,22 +17841,22 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy1293;
+			if (yych <= 'A') goto yy1233;
 			if (yych <= '^') goto yy3;
 			goto yy172;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1322;
+			if (yych <= 'a') goto yy1262;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy1322:
+yy1262:
 	yych = *++YYCURSOR;
 	if (yych == 'Y') goto yy197;
 	if (yych == 'y') goto yy210;
 	goto yy179;
-yy1323:
+yy1263:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
@@ -18775,7 +17871,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'O') goto yy1305;
+			if (yych <= 'O') goto yy1245;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -18784,13 +17880,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 'o') goto yy1334;
+				if (yych <= 'o') goto yy1274;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1324:
+yy1264:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -18805,7 +17901,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy1302;
+			if (yych <= 'E') goto yy1242;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -18814,13 +17910,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 'e') goto yy1331;
+				if (yych <= 'e') goto yy1271;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1325:
+yy1265:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -18836,7 +17932,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '-') {
 				if (yych <= ')') goto yy164;
 				if (yych <= ',') goto yy218;
-				goto yy396;
+				goto yy336;
 			} else {
 				if (yych == '/') goto yy172;
 				goto yy220;
@@ -18848,7 +17944,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'T') goto yy1297;
+				if (yych <= 'T') goto yy1237;
 				if (yych <= 'Z') goto yy167;
 				goto yy218;
 			}
@@ -18858,13 +17954,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy175;
 			} else {
-				if (yych <= 't') goto yy1326;
+				if (yych <= 't') goto yy1266;
 				if (yych <= 'z') goto yy175;
 				goto yy218;
 			}
 		}
 	}
-yy1326:
+yy1266:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -18880,7 +17976,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '-') {
 				if (yych <= ')') goto yy164;
 				if (yych <= ',') goto yy218;
-				goto yy396;
+				goto yy336;
 			} else {
 				if (yych == '/') goto yy172;
 				goto yy220;
@@ -18892,7 +17988,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy218;
 				goto yy168;
 			} else {
-				if (yych <= 'E') goto yy1298;
+				if (yych <= 'E') goto yy1238;
 				if (yych <= 'Z') goto yy168;
 				goto yy218;
 			}
@@ -18902,13 +17998,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy176;
 			} else {
-				if (yych <= 'e') goto yy1327;
+				if (yych <= 'e') goto yy1267;
 				if (yych <= 'z') goto yy176;
 				goto yy218;
 			}
 		}
 	}
-yy1327:
+yy1267:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'L') {
@@ -18923,7 +18019,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'M') goto yy1299;
+			if (yych <= 'M') goto yy1239;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -18932,13 +18028,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'm') goto yy1328;
+				if (yych <= 'm') goto yy1268;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1328:
+yy1268:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'A') {
@@ -18952,24 +18048,24 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'B') goto yy1300;
+			if (yych <= 'B') goto yy1240;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 'b') goto yy1329;
+			if (yych == 'b') goto yy1269;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy1329:
+yy1269:
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1301;
+	if (yych == 'E') goto yy1241;
 	if (yych != 'e') goto yy179;
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy230;
-	if (yych == 'r') goto yy401;
+	if (yych == 'R') goto yy229;
+	if (yych == 'r') goto yy341;
 	goto yy179;
-yy1331:
+yy1271:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -18984,7 +18080,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1303;
+			if (yych <= 'N') goto yy1243;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -18993,13 +18089,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'n') goto yy1332;
+				if (yych <= 'n') goto yy1272;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1332:
+yy1272:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -19014,7 +18110,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1304;
+			if (yych <= 'T') goto yy1244;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -19023,13 +18119,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 't') goto yy1333;
+				if (yych <= 't') goto yy1273;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1333:
+yy1273:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -19043,16 +18139,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'H') goto yy1255;
+			if (yych <= 'H') goto yy1195;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 'h') goto yy1273;
+			if (yych == 'h') goto yy1213;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy1334:
+yy1274:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -19067,7 +18163,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1306;
+			if (yych <= 'N') goto yy1246;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -19076,13 +18172,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'n') goto yy1335;
+				if (yych <= 'n') goto yy1275;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1335:
+yy1275:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -19097,7 +18193,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1265;
+			if (yych <= 'D') goto yy1205;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -19106,13 +18202,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'd') goto yy1277;
+				if (yych <= 'd') goto yy1217;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1336:
+yy1276:
 	yych = *++YYCURSOR;
 	if (yych <= 'C') {
 		if (yych <= ')') {
@@ -19128,12 +18224,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'c') goto yy1337;
+			if (yych <= 'c') goto yy1277;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1337:
+yy1277:
 	yych = *++YYCURSOR;
 	if (yych <= 'K') {
 		if (yych <= ')') {
@@ -19149,16 +18245,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'k') goto yy1338;
+			if (yych <= 'k') goto yy1278;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1338:
+yy1278:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ')') {
-		if (yych == ' ') goto yy1339;
+		if (yych == ' ') goto yy1279;
 		if (yych <= '(') goto yy3;
 		goto yy164;
 	} else {
@@ -19171,30 +18267,30 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy1339:
+yy1279:
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy1340;
+	if (yych == 'O') goto yy1280;
 	if (yych != 'o') goto yy56;
-yy1340:
+yy1280:
 	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy1341;
+	if (yych == 'F') goto yy1281;
 	if (yych != 'f') goto yy56;
-yy1341:
+yy1281:
 	yych = *++YYCURSOR;
 	if (yych != ' ') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1343;
-	if (yych <= '2') goto yy1345;
-	if (yych <= '9') goto yy1346;
+	if (yych <= '1') goto yy1283;
+	if (yych <= '2') goto yy1285;
+	if (yych <= '9') goto yy1286;
 	goto yy56;
-yy1343:
-	yyaccept = 28;
+yy1283:
+	yyaccept = 27;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy1347;
-	if (yych <= '9') goto yy1346;
-	goto yy1347;
-yy1344:
+	if (yych <= '/') goto yy1287;
+	if (yych <= '9') goto yy1286;
+	goto yy1287;
+yy1284:
 #line 1096 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("backof | frontof");
@@ -19217,67 +18313,67 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 19221 "ext/date/lib/parse_date.c"
-yy1345:
-	yyaccept = 28;
+#line 18317 "ext/date/lib/parse_date.c"
+yy1285:
+	yyaccept = 27;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy1347;
-	if (yych >= '5') goto yy1347;
-yy1346:
-	yyaccept = 28;
+	if (yych <= '/') goto yy1287;
+	if (yych >= '5') goto yy1287;
+yy1286:
+	yyaccept = 27;
 	YYMARKER = ++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
 	yych = *YYCURSOR;
-yy1347:
+yy1287:
 	if (yych <= 'A') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1346;
-			goto yy1344;
+			if (yych == '\t') goto yy1286;
+			goto yy1284;
 		} else {
-			if (yych <= ' ') goto yy1346;
-			if (yych <= '@') goto yy1344;
+			if (yych <= ' ') goto yy1286;
+			if (yych <= '@') goto yy1284;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych != 'P') goto yy1344;
+			if (yych != 'P') goto yy1284;
 		} else {
-			if (yych <= 'a') goto yy1348;
-			if (yych != 'p') goto yy1344;
+			if (yych <= 'a') goto yy1288;
+			if (yych != 'p') goto yy1284;
 		}
 	}
-yy1348:
+yy1288:
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
 		if (yych != '.') goto yy56;
 	} else {
-		if (yych <= 'M') goto yy1350;
-		if (yych == 'm') goto yy1350;
+		if (yych <= 'M') goto yy1290;
+		if (yych == 'm') goto yy1290;
 		goto yy56;
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy1350;
+	if (yych == 'M') goto yy1290;
 	if (yych != 'm') goto yy56;
-yy1350:
+yy1290:
 	yych = *++YYCURSOR;
 	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy1352;
-		if (yych == '\t') goto yy1352;
+		if (yych <= 0x00) goto yy1292;
+		if (yych == '\t') goto yy1292;
 		goto yy56;
 	} else {
-		if (yych <= ' ') goto yy1352;
+		if (yych <= ' ') goto yy1292;
 		if (yych != '.') goto yy56;
 	}
 	yych = *++YYCURSOR;
 	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy1352;
+		if (yych <= 0x00) goto yy1292;
 		if (yych <= 0x08) goto yy56;
 	} else {
 		if (yych != ' ') goto yy56;
 	}
-yy1352:
+yy1292:
 	yych = *++YYCURSOR;
-	goto yy1344;
-yy1353:
+	goto yy1284;
+yy1293:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'B') {
@@ -19292,7 +18388,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'C') goto yy1337;
+			if (yych <= 'C') goto yy1277;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -19301,13 +18397,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'c') goto yy1354;
+				if (yych <= 'c') goto yy1294;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1354:
+yy1294:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'J') {
@@ -19322,7 +18418,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'K') goto yy1338;
+			if (yych <= 'K') goto yy1278;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -19331,18 +18427,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 'k') goto yy1355;
+				if (yych <= 'k') goto yy1295;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1355:
+yy1295:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= '(') {
-			if (yych == ' ') goto yy1339;
+			if (yych == ' ') goto yy1279;
 			goto yy3;
 		} else {
 			if (yych <= ')') goto yy164;
@@ -19362,7 +18458,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy1356:
+yy1296:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -19378,12 +18474,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 's') goto yy1357;
+			if (yych <= 's') goto yy1297;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1357:
+yy1297:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -19399,18 +18495,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 't') goto yy1358;
+			if (yych <= 't') goto yy1298;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1358:
+yy1298:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '(') {
 		if (yych <= '\t') {
 			if (yych <= 0x08) goto yy3;
-			goto yy1129;
+			goto yy1069;
 		} else {
 			if (yych != ' ') goto yy3;
 		}
@@ -19425,36 +18521,36 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy1359:
+yy1299:
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy1360;
-	if (yych != 'd') goto yy1130;
-yy1360:
+	if (yych == 'D') goto yy1300;
+	if (yych != 'd') goto yy1070;
+yy1300:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1361;
+	if (yych == 'A') goto yy1301;
 	if (yych != 'a') goto yy56;
-yy1361:
+yy1301:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1362;
+	if (yych == 'Y') goto yy1302;
 	if (yych != 'y') goto yy56;
-yy1362:
-	yyaccept = 26;
+yy1302:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
-		if (yych != ' ') goto yy1144;
+		if (yych != ' ') goto yy1084;
 	} else {
-		if (yych <= 'S') goto yy1169;
-		if (yych == 's') goto yy1169;
-		goto yy1144;
+		if (yych <= 'S') goto yy1109;
+		if (yych == 's') goto yy1109;
+		goto yy1084;
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy1364;
+	if (yych == 'O') goto yy1304;
 	if (yych != 'o') goto yy56;
-yy1364:
+yy1304:
 	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy1365;
+	if (yych == 'F') goto yy1305;
 	if (yych != 'f') goto yy56;
-yy1365:
+yy1305:
 	++YYCURSOR;
 #line 1079 "ext/date/lib/parse_date.re"
 	{
@@ -19472,8 +18568,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 19476 "ext/date/lib/parse_date.c"
-yy1367:
+#line 18572 "ext/date/lib/parse_date.c"
+yy1307:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
@@ -19488,7 +18584,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy1357;
+			if (yych <= 'S') goto yy1297;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -19497,13 +18593,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 's') goto yy1368;
+				if (yych <= 's') goto yy1308;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1368:
+yy1308:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -19518,7 +18614,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1358;
+			if (yych <= 'T') goto yy1298;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -19527,20 +18623,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 't') goto yy1369;
+				if (yych <= 't') goto yy1309;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1369:
+yy1309:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy1129;
+			if (yych == '\t') goto yy1069;
 			if (yych <= 0x1F) goto yy3;
-			goto yy1359;
+			goto yy1299;
 		} else {
 			if (yych == ')') goto yy164;
 			if (yych <= ',') goto yy3;
@@ -19562,7 +18658,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy1370:
+yy1310:
 	yych = *++YYCURSOR;
 	if (yych <= 'B') {
 		if (yych <= ')') {
@@ -19571,7 +18667,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'A') goto yy166;
-			goto yy1406;
+			goto yy1346;
 		}
 	} else {
 		if (yych <= 'a') {
@@ -19579,35 +18675,35 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'b') goto yy1406;
+			if (yych <= 'b') goto yy1346;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1371:
+yy1311:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= '@') {
 			if (yych == ')') goto yy164;
 			goto yy3;
 		} else {
-			if (yych == 'F') goto yy1396;
+			if (yych == 'F') goto yy1336;
 			if (yych <= 'Q') goto yy166;
-			goto yy1395;
+			goto yy1335;
 		}
 	} else {
 		if (yych <= 'f') {
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'e') goto yy166;
-			goto yy1396;
+			goto yy1336;
 		} else {
-			if (yych == 'r') goto yy1395;
+			if (yych == 'r') goto yy1335;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1372:
+yy1312:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych <= ')') {
@@ -19616,7 +18712,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'T') goto yy166;
-			goto yy1392;
+			goto yy1332;
 		}
 	} else {
 		if (yych <= 't') {
@@ -19624,19 +18720,19 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'u') goto yy1392;
+			if (yych <= 'u') goto yy1332;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1373:
+yy1313:
 	yych = *++YYCURSOR;
 	if (yych <= 'O') {
 		if (yych <= '@') {
 			if (yych == ')') goto yy164;
 			goto yy3;
 		} else {
-			if (yych == 'I') goto yy1375;
+			if (yych == 'I') goto yy1315;
 			if (yych <= 'N') goto yy166;
 		}
 	} else {
@@ -19644,14 +18740,14 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'h') goto yy166;
-			goto yy1375;
+			goto yy1315;
 		} else {
-			if (yych == 'o') goto yy1374;
+			if (yych == 'o') goto yy1314;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1374:
+yy1314:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -19660,7 +18756,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'M') goto yy167;
-			goto yy1378;
+			goto yy1318;
 		}
 	} else {
 		if (yych <= 'm') {
@@ -19668,12 +18764,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'n') goto yy1378;
+			if (yych <= 'n') goto yy1318;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1375:
+yy1315:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -19689,12 +18785,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy191;
 			goto yy167;
 		} else {
-			if (yych <= 'd') goto yy1376;
+			if (yych <= 'd') goto yy1316;
 			if (yych <= 'z') goto yy167;
 			goto yy191;
 		}
 	}
-yy1376:
+yy1316:
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy164;
@@ -19704,12 +18800,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'Z') goto yy168;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1377;
+			if (yych <= 'a') goto yy1317;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1377:
+yy1317:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
 		if (yych <= ')') {
@@ -19718,7 +18814,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'X') goto yy169;
-			goto yy1285;
+			goto yy1225;
 		}
 	} else {
 		if (yych <= 'x') {
@@ -19726,12 +18822,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'y') goto yy1285;
+			if (yych <= 'y') goto yy1225;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1378:
+yy1318:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -19747,16 +18843,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 't') goto yy1379;
+			if (yych <= 't') goto yy1319;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1379:
+yy1319:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ')') {
-		if (yych == ' ') goto yy1380;
+		if (yych == ' ') goto yy1320;
 		if (yych <= '(') goto yy3;
 		goto yy164;
 	} else {
@@ -19769,88 +18865,88 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy1380:
+yy1320:
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy1381;
+	if (yych == 'O') goto yy1321;
 	if (yych != 'o') goto yy56;
-yy1381:
+yy1321:
 	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy1382;
+	if (yych == 'F') goto yy1322;
 	if (yych != 'f') goto yy56;
-yy1382:
+yy1322:
 	yych = *++YYCURSOR;
 	if (yych != ' ') goto yy56;
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1384;
-	if (yych <= '2') goto yy1385;
-	if (yych <= '9') goto yy1386;
+	if (yych <= '1') goto yy1324;
+	if (yych <= '2') goto yy1325;
+	if (yych <= '9') goto yy1326;
 	goto yy56;
-yy1384:
-	yyaccept = 28;
+yy1324:
+	yyaccept = 27;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy1387;
-	if (yych <= '9') goto yy1386;
-	goto yy1387;
-yy1385:
-	yyaccept = 28;
+	if (yych <= '/') goto yy1327;
+	if (yych <= '9') goto yy1326;
+	goto yy1327;
+yy1325:
+	yyaccept = 27;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy1387;
-	if (yych >= '5') goto yy1387;
-yy1386:
-	yyaccept = 28;
+	if (yych <= '/') goto yy1327;
+	if (yych >= '5') goto yy1327;
+yy1326:
+	yyaccept = 27;
 	YYMARKER = ++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
 	yych = *YYCURSOR;
-yy1387:
+yy1327:
 	if (yych <= 'A') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1386;
-			goto yy1344;
+			if (yych == '\t') goto yy1326;
+			goto yy1284;
 		} else {
-			if (yych <= ' ') goto yy1386;
-			if (yych <= '@') goto yy1344;
+			if (yych <= ' ') goto yy1326;
+			if (yych <= '@') goto yy1284;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych != 'P') goto yy1344;
+			if (yych != 'P') goto yy1284;
 		} else {
-			if (yych <= 'a') goto yy1388;
-			if (yych != 'p') goto yy1344;
+			if (yych <= 'a') goto yy1328;
+			if (yych != 'p') goto yy1284;
 		}
 	}
-yy1388:
+yy1328:
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
 		if (yych != '.') goto yy56;
 	} else {
-		if (yych <= 'M') goto yy1390;
-		if (yych == 'm') goto yy1390;
+		if (yych <= 'M') goto yy1330;
+		if (yych == 'm') goto yy1330;
 		goto yy56;
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy1390;
+	if (yych == 'M') goto yy1330;
 	if (yych != 'm') goto yy56;
-yy1390:
+yy1330:
 	yych = *++YYCURSOR;
 	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy1352;
-		if (yych == '\t') goto yy1352;
+		if (yych <= 0x00) goto yy1292;
+		if (yych == '\t') goto yy1292;
 		goto yy56;
 	} else {
-		if (yych <= ' ') goto yy1352;
+		if (yych <= ' ') goto yy1292;
 		if (yych != '.') goto yy56;
 	}
 	yych = *++YYCURSOR;
 	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy1352;
+		if (yych <= 0x00) goto yy1292;
 		if (yych <= 0x08) goto yy56;
-		goto yy1352;
+		goto yy1292;
 	} else {
-		if (yych == ' ') goto yy1352;
+		if (yych == ' ') goto yy1292;
 		goto yy56;
 	}
-yy1392:
+yy1332:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -19866,12 +18962,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'r') goto yy1393;
+			if (yych <= 'r') goto yy1333;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1393:
+yy1333:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -19887,12 +18983,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 't') goto yy1394;
+			if (yych <= 't') goto yy1334;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1394:
+yy1334:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -19901,7 +18997,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'G') goto yy169;
-			goto yy1265;
+			goto yy1205;
 		}
 	} else {
 		if (yych <= 'g') {
@@ -19909,12 +19005,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'h') goto yy1265;
+			if (yych <= 'h') goto yy1205;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1395:
+yy1335:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -19923,7 +19019,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'R') goto yy167;
-			goto yy1398;
+			goto yy1338;
 		}
 	} else {
 		if (yych <= 'r') {
@@ -19931,12 +19027,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 's') goto yy1398;
+			if (yych <= 's') goto yy1338;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1396:
+yy1336:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -19952,12 +19048,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 't') goto yy1397;
+			if (yych <= 't') goto yy1337;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1397:
+yy1337:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -19966,7 +19062,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'G') goto yy168;
-			goto yy1288;
+			goto yy1228;
 		}
 	} else {
 		if (yych <= 'g') {
@@ -19974,12 +19070,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'h') goto yy1288;
+			if (yych <= 'h') goto yy1228;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1398:
+yy1338:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -19995,18 +19091,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 't') goto yy1399;
+			if (yych <= 't') goto yy1339;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1399:
+yy1339:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '(') {
 		if (yych <= '\t') {
 			if (yych <= 0x08) goto yy3;
-			goto yy1256;
+			goto yy1196;
 		} else {
 			if (yych != ' ') goto yy3;
 		}
@@ -20021,37 +19117,37 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy1400:
+yy1340:
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy1401;
-	if (yych != 'd') goto yy1257;
-yy1401:
+	if (yych == 'D') goto yy1341;
+	if (yych != 'd') goto yy1197;
+yy1341:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1402;
+	if (yych == 'A') goto yy1342;
 	if (yych != 'a') goto yy56;
-yy1402:
+yy1342:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1403;
+	if (yych == 'Y') goto yy1343;
 	if (yych != 'y') goto yy56;
-yy1403:
-	yyaccept = 26;
+yy1343:
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
-		if (yych != ' ') goto yy1144;
+		if (yych != ' ') goto yy1084;
 	} else {
-		if (yych <= 'S') goto yy1169;
-		if (yych == 's') goto yy1169;
-		goto yy1144;
+		if (yych <= 'S') goto yy1109;
+		if (yych == 's') goto yy1109;
+		goto yy1084;
 	}
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy1405;
+	if (yych == 'O') goto yy1345;
 	if (yych != 'o') goto yy56;
-yy1405:
+yy1345:
 	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy1365;
-	if (yych == 'f') goto yy1365;
+	if (yych == 'F') goto yy1305;
+	if (yych == 'f') goto yy1305;
 	goto yy56;
-yy1406:
+yy1346:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -20086,13 +19182,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'r') goto yy1407;
+				if (yych <= 'r') goto yy1347;
 				if (yych <= 'z') goto yy167;
 				goto yy218;
 			}
 		}
 	}
-yy1407:
+yy1347:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych <= ')') {
@@ -20108,12 +19204,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'u') goto yy1408;
+			if (yych <= 'u') goto yy1348;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1408:
+yy1348:
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy164;
@@ -20123,27 +19219,27 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'Z') goto yy169;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1409;
+			if (yych <= 'a') goto yy1349;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1409:
+yy1349:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'R') goto yy1410;
+		if (yych <= 'R') goto yy1350;
 		if (yych != 'r') goto yy3;
 	}
-yy1410:
+yy1350:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy230;
-	if (yych == 'y') goto yy230;
+	if (yych == 'Y') goto yy229;
+	if (yych == 'y') goto yy229;
 	goto yy56;
-yy1411:
+yy1351:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'A') {
@@ -20158,7 +19254,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'B') goto yy1406;
+			if (yych <= 'B') goto yy1346;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20167,13 +19263,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'b') goto yy1429;
+				if (yych <= 'b') goto yy1369;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1412:
+yy1352:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -20190,14 +19286,14 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '/') goto yy172;
 				goto yy3;
 			} else {
-				if (yych == 'F') goto yy1396;
+				if (yych == 'F') goto yy1336;
 				goto yy166;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'R') goto yy1395;
+				if (yych <= 'R') goto yy1335;
 				goto yy166;
 			} else {
 				if (yych == '_') goto yy172;
@@ -20205,16 +19301,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		} else {
 			if (yych <= 'q') {
-				if (yych == 'f') goto yy1425;
+				if (yych == 'f') goto yy1365;
 				goto yy171;
 			} else {
-				if (yych <= 'r') goto yy1424;
+				if (yych <= 'r') goto yy1364;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1413:
+yy1353:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
@@ -20229,7 +19325,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'U') goto yy1392;
+			if (yych <= 'U') goto yy1332;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20238,13 +19334,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'u') goto yy1421;
+				if (yych <= 'u') goto yy1361;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1414:
+yy1354:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
@@ -20261,14 +19357,14 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '/') goto yy172;
 				goto yy3;
 			} else {
-				if (yych == 'I') goto yy1375;
+				if (yych == 'I') goto yy1315;
 				goto yy166;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'O') goto yy1374;
+				if (yych <= 'O') goto yy1314;
 				goto yy166;
 			} else {
 				if (yych == '_') goto yy172;
@@ -20276,16 +19372,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		} else {
 			if (yych <= 'n') {
-				if (yych == 'i') goto yy1416;
+				if (yych == 'i') goto yy1356;
 				goto yy171;
 			} else {
-				if (yych <= 'o') goto yy1415;
+				if (yych <= 'o') goto yy1355;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1415:
+yy1355:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -20300,7 +19396,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1378;
+			if (yych <= 'N') goto yy1318;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20309,13 +19405,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 'n') goto yy1419;
+				if (yych <= 'n') goto yy1359;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1416:
+yy1356:
 	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -20330,7 +19426,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1376;
+			if (yych <= 'D') goto yy1316;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy191;
 			goto yy172;
@@ -20339,13 +19435,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy191;
 				goto yy175;
 			} else {
-				if (yych <= 'd') goto yy1417;
+				if (yych <= 'd') goto yy1357;
 				if (yych <= 'z') goto yy175;
 				goto yy191;
 			}
 		}
 	}
-yy1417:
+yy1357:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -20359,18 +19455,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy1377;
+			if (yych <= 'A') goto yy1317;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1418;
+			if (yych <= 'a') goto yy1358;
 			if (yych <= 'z') goto yy176;
 			goto yy3;
 		}
 	}
-yy1418:
+yy1358:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -20385,7 +19481,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'Y') goto yy1285;
+			if (yych <= 'Y') goto yy1225;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20394,13 +19490,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'y') goto yy1314;
+				if (yych <= 'y') goto yy1254;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1419:
+yy1359:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -20415,7 +19511,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1379;
+			if (yych <= 'T') goto yy1319;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20424,18 +19520,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 't') goto yy1420;
+				if (yych <= 't') goto yy1360;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1420:
+yy1360:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= '(') {
-			if (yych == ' ') goto yy1380;
+			if (yych == ' ') goto yy1320;
 			goto yy3;
 		} else {
 			if (yych <= ')') goto yy164;
@@ -20455,7 +19551,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy1421:
+yy1361:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -20470,7 +19566,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy1393;
+			if (yych <= 'R') goto yy1333;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20479,13 +19575,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 'r') goto yy1422;
+				if (yych <= 'r') goto yy1362;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1422:
+yy1362:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -20500,7 +19596,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1394;
+			if (yych <= 'T') goto yy1334;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20509,13 +19605,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 't') goto yy1423;
+				if (yych <= 't') goto yy1363;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1423:
+yy1363:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -20530,7 +19626,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'H') goto yy1265;
+			if (yych <= 'H') goto yy1205;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20539,13 +19635,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'h') goto yy1277;
+				if (yych <= 'h') goto yy1217;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1424:
+yy1364:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
@@ -20560,7 +19656,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy1398;
+			if (yych <= 'S') goto yy1338;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20569,13 +19665,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 's') goto yy1427;
+				if (yych <= 's') goto yy1367;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1425:
+yy1365:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -20590,7 +19686,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1397;
+			if (yych <= 'T') goto yy1337;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20599,13 +19695,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 't') goto yy1426;
+				if (yych <= 't') goto yy1366;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1426:
+yy1366:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -20620,7 +19716,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'H') goto yy1288;
+			if (yych <= 'H') goto yy1228;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20629,13 +19725,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'h') goto yy1317;
+				if (yych <= 'h') goto yy1257;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1427:
+yy1367:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -20650,7 +19746,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1399;
+			if (yych <= 'T') goto yy1339;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20659,20 +19755,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 't') goto yy1428;
+				if (yych <= 't') goto yy1368;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1428:
+yy1368:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy1256;
+			if (yych == '\t') goto yy1196;
 			if (yych <= 0x1F) goto yy3;
-			goto yy1400;
+			goto yy1340;
 		} else {
 			if (yych == ')') goto yy164;
 			if (yych <= ',') goto yy3;
@@ -20694,7 +19790,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy1429:
+yy1369:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -20710,7 +19806,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '-') {
 				if (yych <= ')') goto yy164;
 				if (yych <= ',') goto yy218;
-				goto yy396;
+				goto yy336;
 			} else {
 				if (yych == '/') goto yy172;
 				goto yy220;
@@ -20722,7 +19818,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'R') goto yy1407;
+				if (yych <= 'R') goto yy1347;
 				if (yych <= 'Z') goto yy167;
 				goto yy218;
 			}
@@ -20732,13 +19828,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy175;
 			} else {
-				if (yych <= 'r') goto yy1430;
+				if (yych <= 'r') goto yy1370;
 				if (yych <= 'z') goto yy175;
 				goto yy218;
 			}
 		}
 	}
-yy1430:
+yy1370:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
@@ -20753,7 +19849,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'U') goto yy1408;
+			if (yych <= 'U') goto yy1348;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -20762,13 +19858,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'u') goto yy1431;
+				if (yych <= 'u') goto yy1371;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1431:
+yy1371:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -20782,18 +19878,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy1409;
+			if (yych <= 'A') goto yy1349;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1432;
+			if (yych <= 'a') goto yy1372;
 			if (yych <= 'z') goto yy177;
 			goto yy3;
 		}
 	}
-yy1432:
+yy1372:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -20807,33 +19903,33 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'R') goto yy1410;
+			if (yych <= 'R') goto yy1350;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 'r') goto yy1433;
+			if (yych == 'r') goto yy1373;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy1433:
+yy1373:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy230;
-	if (yych == 'y') goto yy401;
+	if (yych == 'Y') goto yy229;
+	if (yych == 'y') goto yy341;
 	goto yy179;
-yy1434:
+yy1374:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
-yy1435:
-	yyaccept = 29;
+yy1375:
+	yyaccept = 28;
 	YYMARKER = ++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
 	yych = *YYCURSOR;
-	if (yych == '.') goto yy1438;
-	if (yych <= '/') goto yy1437;
-	if (yych <= '9') goto yy1435;
-yy1437:
+	if (yych == '.') goto yy1378;
+	if (yych <= '/') goto yy1377;
+	if (yych <= '9') goto yy1375;
+yy1377:
 #line 1025 "ext/date/lib/parse_date.re"
 	{
 		timelib_ull i;
@@ -20859,8 +19955,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 20863 "ext/date/lib/parse_date.c"
-yy1438:
+#line 19959 "ext/date/lib/parse_date.c"
+yy1378:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
@@ -20907,8 +20003,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 20911 "ext/date/lib/parse_date.c"
-yy1446:
+#line 20007 "ext/date/lib/parse_date.c"
+yy1386:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -20917,7 +20013,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'M') goto yy166;
-			goto yy1487;
+			goto yy1427;
 		}
 	} else {
 		if (yych <= 'm') {
@@ -20925,58 +20021,58 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'n') goto yy1487;
+			if (yych <= 'n') goto yy1427;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1447:
+yy1387:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych <= '@') {
 			if (yych == ')') goto yy164;
 			goto yy3;
 		} else {
-			if (yych == 'I') goto yy1479;
+			if (yych == 'I') goto yy1419;
 			if (yych <= 'T') goto yy166;
-			goto yy1480;
+			goto yy1420;
 		}
 	} else {
 		if (yych <= 'i') {
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'h') goto yy166;
-			goto yy1479;
+			goto yy1419;
 		} else {
-			if (yych == 'u') goto yy1480;
+			if (yych == 'u') goto yy1420;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1448:
+yy1388:
 	yych = *++YYCURSOR;
 	if (yych <= 'M') {
 		if (yych <= '@') {
 			if (yych == ')') goto yy164;
 			goto yy3;
 		} else {
-			if (yych == 'D') goto yy1468;
+			if (yych == 'D') goto yy1408;
 			if (yych <= 'L') goto yy166;
-			goto yy1469;
+			goto yy1409;
 		}
 	} else {
 		if (yych <= 'd') {
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'c') goto yy166;
-			goto yy1468;
+			goto yy1408;
 		} else {
-			if (yych == 'm') goto yy1469;
+			if (yych == 'm') goto yy1409;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1449:
+yy1389:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -20985,7 +20081,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'D') goto yy166;
-			goto yy1464;
+			goto yy1404;
 		}
 	} else {
 		if (yych <= 'd') {
@@ -20993,12 +20089,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'e') goto yy1464;
+			if (yych <= 'e') goto yy1404;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1450:
+yy1390:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -21007,7 +20103,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'D') goto yy166;
-			goto yy1460;
+			goto yy1400;
 		}
 	} else {
 		if (yych <= 'd') {
@@ -21015,68 +20111,68 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'e') goto yy1460;
+			if (yych <= 'e') goto yy1400;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1451:
+yy1391:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
-		if (yych == '.') goto yy1089;
+		if (yych == '.') goto yy1029;
 		goto yy56;
 	} else {
-		if (yych <= '9') goto yy1454;
-		if (yych <= ':') goto yy1089;
+		if (yych <= '9') goto yy1394;
+		if (yych <= ':') goto yy1029;
 		goto yy56;
 	}
-yy1452:
+yy1392:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
-		if (yych == '.') goto yy1089;
+		if (yych == '.') goto yy1029;
 		goto yy56;
 	} else {
-		if (yych <= '4') goto yy1454;
-		if (yych == ':') goto yy1089;
+		if (yych <= '4') goto yy1394;
+		if (yych == ':') goto yy1029;
 		goto yy56;
 	}
-yy1453:
+yy1393:
 	yych = *++YYCURSOR;
-	if (yych == '.') goto yy1089;
-	if (yych == ':') goto yy1089;
+	if (yych == '.') goto yy1029;
+	if (yych == ':') goto yy1029;
 	goto yy56;
-yy1454:
+yy1394:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
-		if (yych == '.') goto yy1089;
+		if (yych == '.') goto yy1029;
 		goto yy56;
 	} else {
-		if (yych <= '5') goto yy1455;
-		if (yych == ':') goto yy1089;
+		if (yych <= '5') goto yy1395;
+		if (yych == ':') goto yy1029;
 		goto yy56;
 	}
-yy1455:
+yy1395:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
-	yyaccept = 24;
+	yyaccept = 23;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy1092;
-	if (yych <= '5') goto yy1457;
-	if (yych <= '6') goto yy1458;
-	goto yy1092;
-yy1457:
+	if (yych <= '/') goto yy1032;
+	if (yych <= '5') goto yy1397;
+	if (yych <= '6') goto yy1398;
+	goto yy1032;
+yy1397:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1459;
+	if (yych <= '9') goto yy1399;
 	goto yy56;
-yy1458:
+yy1398:
 	yych = *++YYCURSOR;
 	if (yych != '0') goto yy56;
-yy1459:
+yy1399:
 	yych = *++YYCURSOR;
-	goto yy1100;
-yy1460:
+	goto yy1040;
+yy1400:
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
 		if (yych <= ')') {
@@ -21092,12 +20188,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'l') goto yy1461;
+			if (yych <= 'l') goto yy1401;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1461:
+yy1401:
 	yych = *++YYCURSOR;
 	if (yych <= 'F') {
 		if (yych <= ')') {
@@ -21113,12 +20209,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'f') goto yy1462;
+			if (yych <= 'f') goto yy1402;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1462:
+yy1402:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -21134,23 +20230,23 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 't') goto yy1463;
+			if (yych <= 't') goto yy1403;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1463:
+yy1403:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'H') goto yy1255;
-		if (yych == 'h') goto yy1255;
+		if (yych <= 'H') goto yy1195;
+		if (yych == 'h') goto yy1195;
 		goto yy3;
 	}
-yy1464:
+yy1404:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -21166,12 +20262,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy191;
 			goto yy167;
 		} else {
-			if (yych <= 's') goto yy1465;
+			if (yych <= 's') goto yy1405;
 			if (yych <= 'z') goto yy167;
 			goto yy191;
 		}
 	}
-yy1465:
+yy1405:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -21187,12 +20283,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'd') goto yy1466;
+			if (yych <= 'd') goto yy1406;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1466:
+yy1406:
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy164;
@@ -21202,12 +20298,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'Z') goto yy169;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1467;
+			if (yych <= 'a') goto yy1407;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1467:
+yy1407:
 	yych = *++YYCURSOR;
 	if (yych <= 'X') {
 		if (yych == ')') goto yy164;
@@ -21217,23 +20313,23 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		if (yych == 'y') goto yy197;
 		goto yy3;
 	}
-yy1468:
+yy1408:
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy164;
 		if (yych <= '@') goto yy3;
-		goto yy1476;
+		goto yy1416;
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') goto yy167;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1476;
+			if (yych <= 'a') goto yy1416;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1469:
+yy1409:
 	yych = *++YYCURSOR;
 	if (yych <= 'O') {
 		if (yych <= ')') {
@@ -21249,12 +20345,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'o') goto yy1470;
+			if (yych <= 'o') goto yy1410;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1470:
+yy1410:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -21270,12 +20366,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'r') goto yy1471;
+			if (yych <= 'r') goto yy1411;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1471:
+yy1411:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -21291,28 +20387,28 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'r') goto yy1472;
+			if (yych <= 'r') goto yy1412;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1472:
+yy1412:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'O') goto yy1473;
+		if (yych <= 'O') goto yy1413;
 		if (yych != 'o') goto yy3;
 	}
-yy1473:
+yy1413:
 	yych = *++YYCURSOR;
-	if (yych == 'W') goto yy1474;
+	if (yych == 'W') goto yy1414;
 	if (yych != 'w') goto yy56;
-yy1474:
+yy1414:
 	++YYCURSOR;
-yy1475:
+yy1415:
 #line 1013 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("tomorrow");
@@ -21324,8 +20420,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 21328 "ext/date/lib/parse_date.c"
-yy1476:
+#line 20424 "ext/date/lib/parse_date.c"
+yy1416:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
 		if (yych <= ')') {
@@ -21341,21 +20437,21 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'y') goto yy1477;
+			if (yych <= 'y') goto yy1417;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1477:
+yy1417:
 	++YYCURSOR;
 	if ((yych = *YYCURSOR) <= '@') {
 		if (yych == ')') goto yy164;
 	} else {
 		if (yych <= 'Z') goto yy169;
-		if (yych <= '`') goto yy1478;
+		if (yych <= '`') goto yy1418;
 		if (yych <= 'z') goto yy169;
 	}
-yy1478:
+yy1418:
 #line 1003 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("midnight | today");
@@ -21365,8 +20461,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 21369 "ext/date/lib/parse_date.c"
-yy1479:
+#line 20465 "ext/date/lib/parse_date.c"
+yy1419:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= '@') {
@@ -21374,8 +20470,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		} else {
 			if (yych <= 'Q') goto yy167;
-			if (yych <= 'R') goto yy1485;
-			goto yy1486;
+			if (yych <= 'R') goto yy1425;
+			goto yy1426;
 		}
 	} else {
 		if (yych <= 'q') {
@@ -21383,13 +20479,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'r') goto yy1485;
-			if (yych <= 's') goto yy1486;
+			if (yych <= 'r') goto yy1425;
+			if (yych <= 's') goto yy1426;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1480:
+yy1420:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -21405,12 +20501,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy191;
 			goto yy167;
 		} else {
-			if (yych <= 'r') goto yy1481;
+			if (yych <= 'r') goto yy1421;
 			if (yych <= 'z') goto yy167;
 			goto yy191;
 		}
 	}
-yy1481:
+yy1421:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -21426,12 +20522,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 's') goto yy1482;
+			if (yych <= 's') goto yy1422;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1482:
+yy1422:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -21447,27 +20543,27 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'd') goto yy1483;
+			if (yych <= 'd') goto yy1423;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1483:
+yy1423:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'A') goto yy1484;
+		if (yych <= 'A') goto yy1424;
 		if (yych != 'a') goto yy3;
 	}
-yy1484:
+yy1424:
 	yych = *++YYCURSOR;
 	if (yych == 'Y') goto yy197;
 	if (yych == 'y') goto yy197;
 	goto yy56;
-yy1485:
+yy1425:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -21476,7 +20572,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'C') goto yy168;
-			goto yy1288;
+			goto yy1228;
 		}
 	} else {
 		if (yych <= 'c') {
@@ -21484,20 +20580,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'd') goto yy1288;
+			if (yych <= 'd') goto yy1228;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1486:
+yy1426:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '(') {
 		if (yych <= '\t') {
 			if (yych <= 0x08) goto yy3;
-			goto yy1129;
+			goto yy1069;
 		} else {
-			if (yych == ' ') goto yy1129;
+			if (yych == ' ') goto yy1069;
 			goto yy3;
 		}
 	} else {
@@ -21511,7 +20607,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy1487:
+yy1427:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -21527,12 +20623,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 't') goto yy1488;
+			if (yych <= 't') goto yy1428;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1488:
+yy1428:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -21541,7 +20637,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'G') goto yy168;
-			goto yy1288;
+			goto yy1228;
 		}
 	} else {
 		if (yych <= 'g') {
@@ -21549,12 +20645,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'h') goto yy1288;
+			if (yych <= 'h') goto yy1228;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1489:
+yy1429:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -21569,7 +20665,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1487;
+			if (yych <= 'N') goto yy1427;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -21578,13 +20674,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'n') goto yy1519;
+				if (yych <= 'n') goto yy1459;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1490:
+yy1430:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
@@ -21601,14 +20697,14 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '/') goto yy172;
 				goto yy3;
 			} else {
-				if (yych == 'I') goto yy1479;
+				if (yych == 'I') goto yy1419;
 				goto yy166;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'U') goto yy1480;
+				if (yych <= 'U') goto yy1420;
 				goto yy166;
 			} else {
 				if (yych == '_') goto yy172;
@@ -21616,16 +20712,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		} else {
 			if (yych <= 't') {
-				if (yych == 'i') goto yy1511;
+				if (yych == 'i') goto yy1451;
 				goto yy171;
 			} else {
-				if (yych <= 'u') goto yy1512;
+				if (yych <= 'u') goto yy1452;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1491:
+yy1431:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'L') {
@@ -21642,14 +20738,14 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '/') goto yy172;
 				goto yy3;
 			} else {
-				if (yych == 'D') goto yy1468;
+				if (yych == 'D') goto yy1408;
 				goto yy166;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'M') goto yy1469;
+				if (yych <= 'M') goto yy1409;
 				goto yy166;
 			} else {
 				if (yych == '_') goto yy172;
@@ -21657,16 +20753,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		} else {
 			if (yych <= 'l') {
-				if (yych == 'd') goto yy1502;
+				if (yych == 'd') goto yy1442;
 				goto yy171;
 			} else {
-				if (yych <= 'm') goto yy1503;
+				if (yych <= 'm') goto yy1443;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1492:
+yy1432:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -21681,7 +20777,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy1464;
+			if (yych <= 'E') goto yy1404;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -21690,13 +20786,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'e') goto yy1498;
+				if (yych <= 'e') goto yy1438;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1493:
+yy1433:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -21711,7 +20807,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy1460;
+			if (yych <= 'E') goto yy1400;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -21720,13 +20816,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'e') goto yy1494;
+				if (yych <= 'e') goto yy1434;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1494:
+yy1434:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'K') {
@@ -21741,7 +20837,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'L') goto yy1461;
+			if (yych <= 'L') goto yy1401;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -21750,13 +20846,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 'l') goto yy1495;
+				if (yych <= 'l') goto yy1435;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1495:
+yy1435:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'E') {
@@ -21771,7 +20867,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'F') goto yy1462;
+			if (yych <= 'F') goto yy1402;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -21780,13 +20876,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'f') goto yy1496;
+				if (yych <= 'f') goto yy1436;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1496:
+yy1436:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -21801,7 +20897,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1463;
+			if (yych <= 'T') goto yy1403;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -21810,13 +20906,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 't') goto yy1497;
+				if (yych <= 't') goto yy1437;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1497:
+yy1437:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -21830,16 +20926,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'H') goto yy1255;
+			if (yych <= 'H') goto yy1195;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 'h') goto yy1273;
+			if (yych == 'h') goto yy1213;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy1498:
+yy1438:
 	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
@@ -21854,7 +20950,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy1465;
+			if (yych <= 'S') goto yy1405;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy191;
 			goto yy172;
@@ -21863,13 +20959,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy191;
 				goto yy175;
 			} else {
-				if (yych <= 's') goto yy1499;
+				if (yych <= 's') goto yy1439;
 				if (yych <= 'z') goto yy175;
 				goto yy191;
 			}
 		}
 	}
-yy1499:
+yy1439:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -21884,7 +20980,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1466;
+			if (yych <= 'D') goto yy1406;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -21893,13 +20989,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'd') goto yy1500;
+				if (yych <= 'd') goto yy1440;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1500:
+yy1440:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -21913,18 +21009,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy1467;
+			if (yych <= 'A') goto yy1407;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1501;
+			if (yych <= 'a') goto yy1441;
 			if (yych <= 'z') goto yy177;
 			goto yy3;
 		}
 	}
-yy1501:
+yy1441:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -21947,7 +21043,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy3;
 		}
 	}
-yy1502:
+yy1442:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -21961,18 +21057,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy1476;
+			if (yych <= 'A') goto yy1416;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1509;
+			if (yych <= 'a') goto yy1449;
 			if (yych <= 'z') goto yy175;
 			goto yy3;
 		}
 	}
-yy1503:
+yy1443:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
@@ -21987,7 +21083,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'O') goto yy1470;
+			if (yych <= 'O') goto yy1410;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -21996,13 +21092,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 'o') goto yy1504;
+				if (yych <= 'o') goto yy1444;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1504:
+yy1444:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -22017,7 +21113,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy1471;
+			if (yych <= 'R') goto yy1411;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22026,13 +21122,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'r') goto yy1505;
+				if (yych <= 'r') goto yy1445;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1505:
+yy1445:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -22047,7 +21143,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy1472;
+			if (yych <= 'R') goto yy1412;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22056,13 +21152,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'r') goto yy1506;
+				if (yych <= 'r') goto yy1446;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1506:
+yy1446:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
@@ -22076,33 +21172,33 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'O') goto yy1473;
+			if (yych <= 'O') goto yy1413;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 'o') goto yy1507;
+			if (yych == 'o') goto yy1447;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy1507:
+yy1447:
 	yych = *++YYCURSOR;
-	if (yych == 'W') goto yy1474;
+	if (yych == 'W') goto yy1414;
 	if (yych != 'w') goto yy179;
-	yyaccept = 30;
+	yyaccept = 29;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 16) {
 		goto yy178;
 	}
 	if (yych <= '.') {
 		if (yych == '-') goto yy172;
-		goto yy1475;
+		goto yy1415;
 	} else {
 		if (yych <= '/') goto yy172;
 		if (yych == '_') goto yy172;
-		goto yy1475;
+		goto yy1415;
 	}
-yy1509:
+yy1449:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -22117,7 +21213,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'Y') goto yy1477;
+			if (yych <= 'Y') goto yy1417;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22126,36 +21222,36 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'y') goto yy1510;
+				if (yych <= 'y') goto yy1450;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1510:
-	yyaccept = 31;
+yy1450:
+	yyaccept = 30;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
 			if (yych == ')') goto yy164;
-			goto yy1478;
+			goto yy1418;
 		} else {
-			if (yych == '.') goto yy1478;
+			if (yych == '.') goto yy1418;
 			goto yy172;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy1478;
+			if (yych <= '@') goto yy1418;
 			if (yych <= 'Z') goto yy169;
-			goto yy1478;
+			goto yy1418;
 		} else {
 			if (yych <= '_') goto yy172;
-			if (yych <= '`') goto yy1478;
+			if (yych <= '`') goto yy1418;
 			if (yych <= 'z') goto yy177;
-			goto yy1478;
+			goto yy1418;
 		}
 	}
-yy1511:
+yy1451:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
@@ -22170,13 +21266,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			} else {
 				if (yych <= '@') goto yy3;
 				if (yych <= 'Q') goto yy167;
-				goto yy1485;
+				goto yy1425;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'S') goto yy1486;
+				if (yych <= 'S') goto yy1426;
 				goto yy167;
 			} else {
 				if (yych == '_') goto yy172;
@@ -22185,15 +21281,15 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= 'r') {
 				if (yych <= 'q') goto yy175;
-				goto yy1517;
+				goto yy1457;
 			} else {
-				if (yych <= 's') goto yy1518;
+				if (yych <= 's') goto yy1458;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1512:
+yy1452:
 	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -22208,7 +21304,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy1481;
+			if (yych <= 'R') goto yy1421;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy191;
 			goto yy172;
@@ -22217,13 +21313,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy191;
 				goto yy175;
 			} else {
-				if (yych <= 'r') goto yy1513;
+				if (yych <= 'r') goto yy1453;
 				if (yych <= 'z') goto yy175;
 				goto yy191;
 			}
 		}
 	}
-yy1513:
+yy1453:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
@@ -22238,7 +21334,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy1482;
+			if (yych <= 'S') goto yy1422;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22247,13 +21343,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 's') goto yy1514;
+				if (yych <= 's') goto yy1454;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1514:
+yy1454:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -22268,7 +21364,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1483;
+			if (yych <= 'D') goto yy1423;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22277,13 +21373,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'd') goto yy1515;
+				if (yych <= 'd') goto yy1455;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1515:
+yy1455:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -22297,22 +21393,22 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy1484;
+			if (yych <= 'A') goto yy1424;
 			if (yych <= '^') goto yy3;
 			goto yy172;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1516;
+			if (yych <= 'a') goto yy1456;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy1516:
+yy1456:
 	yych = *++YYCURSOR;
 	if (yych == 'Y') goto yy197;
 	if (yych == 'y') goto yy210;
 	goto yy179;
-yy1517:
+yy1457:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -22327,7 +21423,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1288;
+			if (yych <= 'D') goto yy1228;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22336,20 +21432,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'd') goto yy1317;
+				if (yych <= 'd') goto yy1257;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1518:
+yy1458:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy1129;
+			if (yych == '\t') goto yy1069;
 			if (yych <= 0x1F) goto yy3;
-			goto yy1129;
+			goto yy1069;
 		} else {
 			if (yych == ')') goto yy164;
 			if (yych <= ',') goto yy3;
@@ -22371,7 +21467,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy1519:
+yy1459:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -22386,7 +21482,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1488;
+			if (yych <= 'T') goto yy1428;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22395,13 +21491,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 't') goto yy1520;
+				if (yych <= 't') goto yy1460;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1520:
+yy1460:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -22416,7 +21512,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'H') goto yy1288;
+			if (yych <= 'H') goto yy1228;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22425,36 +21521,36 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'h') goto yy1317;
+				if (yych <= 'h') goto yy1257;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1521:
+yy1461:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
 		if (yych <= '@') {
 			if (yych == ')') goto yy164;
 			goto yy3;
 		} else {
-			if (yych == 'R') goto yy1533;
+			if (yych == 'R') goto yy1473;
 			if (yych <= 'X') goto yy166;
-			goto yy1534;
+			goto yy1474;
 		}
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'q') goto yy166;
-			goto yy1533;
+			goto yy1473;
 		} else {
-			if (yych == 'y') goto yy1534;
+			if (yych == 'y') goto yy1474;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1522:
+yy1462:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -22463,7 +21559,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'C') goto yy166;
-			goto yy1527;
+			goto yy1467;
 		}
 	} else {
 		if (yych <= 'c') {
@@ -22471,12 +21567,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'd') goto yy1527;
+			if (yych <= 'd') goto yy1467;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1523:
+yy1463:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -22492,12 +21588,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'n') goto yy1524;
+			if (yych <= 'n') goto yy1464;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1524:
+yy1464:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -22513,12 +21609,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy191;
 			goto yy167;
 		} else {
-			if (yych <= 'd') goto yy1525;
+			if (yych <= 'd') goto yy1465;
 			if (yych <= 'z') goto yy167;
 			goto yy191;
 		}
 	}
-yy1525:
+yy1465:
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy164;
@@ -22528,12 +21624,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= 'Z') goto yy168;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1526;
+			if (yych <= 'a') goto yy1466;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1526:
+yy1466:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
 		if (yych <= ')') {
@@ -22542,7 +21638,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'X') goto yy169;
-			goto yy1285;
+			goto yy1225;
 		}
 	} else {
 		if (yych <= 'x') {
@@ -22550,12 +21646,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'y') goto yy1285;
+			if (yych <= 'y') goto yy1225;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1527:
+yy1467:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -22571,12 +21667,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'n') goto yy1528;
+			if (yych <= 'n') goto yy1468;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1528:
+yy1468:
 	yych = *++YYCURSOR;
 	if (yych <= 'I') {
 		if (yych <= ')') {
@@ -22592,12 +21688,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'i') goto yy1529;
+			if (yych <= 'i') goto yy1469;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1529:
+yy1469:
 	yych = *++YYCURSOR;
 	if (yych <= 'G') {
 		if (yych <= ')') {
@@ -22613,29 +21709,29 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'g') goto yy1530;
+			if (yych <= 'g') goto yy1470;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1530:
+yy1470:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'H') goto yy1531;
+		if (yych <= 'H') goto yy1471;
 		if (yych != 'h') goto yy3;
 	}
-yy1531:
+yy1471:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1532;
+	if (yych == 'T') goto yy1472;
 	if (yych != 't') goto yy56;
-yy1532:
+yy1472:
 	yych = *++YYCURSOR;
-	goto yy1478;
-yy1533:
+	goto yy1418;
+yy1473:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -22663,7 +21759,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '9') goto yy220;
 				goto yy218;
 			} else {
-				if (yych == 'C') goto yy1535;
+				if (yych == 'C') goto yy1475;
 				goto yy167;
 			}
 		} else {
@@ -22671,13 +21767,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'c') goto yy1535;
+				if (yych <= 'c') goto yy1475;
 				if (yych <= 'z') goto yy167;
 				goto yy218;
 			}
 		}
 	}
-yy1534:
+yy1474:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
@@ -22702,7 +21798,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			goto yy218;
 		}
 	}
-yy1535:
+yy1475:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -22711,7 +21807,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'G') goto yy168;
-			goto yy420;
+			goto yy360;
 		}
 	} else {
 		if (yych <= 'g') {
@@ -22719,12 +21815,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'h') goto yy420;
+			if (yych <= 'h') goto yy360;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1536:
+yy1476:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -22741,14 +21837,14 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '/') goto yy172;
 				goto yy3;
 			} else {
-				if (yych == 'R') goto yy1533;
+				if (yych == 'R') goto yy1473;
 				goto yy166;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'Y') goto yy1534;
+				if (yych <= 'Y') goto yy1474;
 				goto yy166;
 			} else {
 				if (yych == '_') goto yy172;
@@ -22756,16 +21852,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		} else {
 			if (yych <= 'x') {
-				if (yych == 'r') goto yy1548;
+				if (yych == 'r') goto yy1488;
 				goto yy171;
 			} else {
-				if (yych <= 'y') goto yy1549;
+				if (yych <= 'y') goto yy1489;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1537:
+yy1477:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -22780,7 +21876,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1527;
+			if (yych <= 'D') goto yy1467;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22789,13 +21885,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'd') goto yy1542;
+				if (yych <= 'd') goto yy1482;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1538:
+yy1478:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -22810,7 +21906,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1524;
+			if (yych <= 'N') goto yy1464;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22819,13 +21915,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'n') goto yy1539;
+				if (yych <= 'n') goto yy1479;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1539:
+yy1479:
 	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -22840,7 +21936,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1525;
+			if (yych <= 'D') goto yy1465;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy191;
 			goto yy172;
@@ -22849,13 +21945,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy191;
 				goto yy175;
 			} else {
-				if (yych <= 'd') goto yy1540;
+				if (yych <= 'd') goto yy1480;
 				if (yych <= 'z') goto yy175;
 				goto yy191;
 			}
 		}
 	}
-yy1540:
+yy1480:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -22869,18 +21965,18 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy1526;
+			if (yych <= 'A') goto yy1466;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1541;
+			if (yych <= 'a') goto yy1481;
 			if (yych <= 'z') goto yy176;
 			goto yy3;
 		}
 	}
-yy1541:
+yy1481:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -22895,7 +21991,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'Y') goto yy1285;
+			if (yych <= 'Y') goto yy1225;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22904,13 +22000,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'y') goto yy1314;
+				if (yych <= 'y') goto yy1254;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1542:
+yy1482:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -22925,7 +22021,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1528;
+			if (yych <= 'N') goto yy1468;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22934,13 +22030,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 'n') goto yy1543;
+				if (yych <= 'n') goto yy1483;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1543:
+yy1483:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'H') {
@@ -22955,7 +22051,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'I') goto yy1529;
+			if (yych <= 'I') goto yy1469;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22964,13 +22060,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'i') goto yy1544;
+				if (yych <= 'i') goto yy1484;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1544:
+yy1484:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'F') {
@@ -22985,7 +22081,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'G') goto yy1530;
+			if (yych <= 'G') goto yy1470;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -22994,13 +22090,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'g') goto yy1545;
+				if (yych <= 'g') goto yy1485;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1545:
+yy1485:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -23014,33 +22110,33 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'H') goto yy1531;
+			if (yych <= 'H') goto yy1471;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 'h') goto yy1546;
+			if (yych == 'h') goto yy1486;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy1546:
+yy1486:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1532;
+	if (yych == 'T') goto yy1472;
 	if (yych != 't') goto yy179;
-	yyaccept = 31;
+	yyaccept = 30;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 16) {
 		goto yy178;
 	}
 	if (yych <= '.') {
 		if (yych == '-') goto yy172;
-		goto yy1478;
+		goto yy1418;
 	} else {
 		if (yych <= '/') goto yy172;
 		if (yych == '_') goto yy172;
-		goto yy1478;
+		goto yy1418;
 	}
-yy1548:
+yy1488:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -23056,7 +22152,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '-') {
 				if (yych <= ')') goto yy164;
 				if (yych <= ',') goto yy218;
-				goto yy396;
+				goto yy336;
 			} else {
 				if (yych == '/') goto yy172;
 				goto yy220;
@@ -23068,7 +22164,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'C') goto yy1535;
+				if (yych <= 'C') goto yy1475;
 				if (yych <= 'Z') goto yy167;
 				goto yy218;
 			}
@@ -23078,13 +22174,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy175;
 			} else {
-				if (yych <= 'c') goto yy1550;
+				if (yych <= 'c') goto yy1490;
 				if (yych <= 'z') goto yy175;
 				goto yy218;
 			}
 		}
 	}
-yy1549:
+yy1489:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -23098,7 +22194,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				goto yy164;
 			} else {
 				if (yych <= ',') goto yy218;
-				if (yych <= '-') goto yy396;
+				if (yych <= '-') goto yy336;
 				goto yy220;
 			}
 		}
@@ -23119,7 +22215,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		}
 	}
-yy1550:
+yy1490:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -23134,7 +22230,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'H') goto yy420;
+			if (yych <= 'H') goto yy360;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -23143,13 +22239,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'h') goto yy431;
+				if (yych <= 'h') goto yy371;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1551:
+yy1491:
 	yych = *++YYCURSOR;
 	if (yych <= 'W') {
 		if (yych <= 'N') {
@@ -23157,29 +22253,29 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '@') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'O') goto yy1559;
+			if (yych <= 'O') goto yy1499;
 			if (yych <= 'U') goto yy166;
-			if (yych <= 'V') goto yy1560;
-			goto yy1557;
+			if (yych <= 'V') goto yy1500;
+			goto yy1497;
 		}
 	} else {
 		if (yych <= 'o') {
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'n') goto yy166;
-			goto yy1559;
+			goto yy1499;
 		} else {
 			if (yych <= 'v') {
 				if (yych <= 'u') goto yy166;
-				goto yy1560;
+				goto yy1500;
 			} else {
-				if (yych <= 'w') goto yy1557;
+				if (yych <= 'w') goto yy1497;
 				if (yych <= 'z') goto yy166;
 				goto yy3;
 			}
 		}
 	}
-yy1552:
+yy1492:
 	yych = *++YYCURSOR;
 	if (yych <= 'X') {
 		if (yych <= ')') {
@@ -23188,7 +22284,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'W') goto yy166;
-			goto yy1556;
+			goto yy1496;
 		}
 	} else {
 		if (yych <= 'w') {
@@ -23196,12 +22292,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'x') goto yy1556;
+			if (yych <= 'x') goto yy1496;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1553:
+yy1493:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -23217,12 +22313,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 'n') goto yy1554;
+			if (yych <= 'n') goto yy1494;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1554:
+yy1494:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -23238,12 +22334,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 't') goto yy1555;
+			if (yych <= 't') goto yy1495;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1555:
+yy1495:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -23252,7 +22348,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'G') goto yy168;
-			goto yy1288;
+			goto yy1228;
 		}
 	} else {
 		if (yych <= 'g') {
@@ -23260,12 +22356,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'h') goto yy1288;
+			if (yych <= 'h') goto yy1228;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1556:
+yy1496:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -23274,7 +22370,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'S') goto yy167;
-			goto yy1486;
+			goto yy1426;
 		}
 	} else {
 		if (yych <= 's') {
@@ -23282,21 +22378,21 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 't') goto yy1486;
+			if (yych <= 't') goto yy1426;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1557:
+yy1497:
 	++YYCURSOR;
 	if ((yych = *YYCURSOR) <= '@') {
 		if (yych == ')') goto yy164;
 	} else {
 		if (yych <= 'Z') goto yy167;
-		if (yych <= '`') goto yy1558;
+		if (yych <= '`') goto yy1498;
 		if (yych <= 'z') goto yy167;
 	}
-yy1558:
+yy1498:
 #line 982 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("now");
@@ -23305,8 +22401,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 23309 "ext/date/lib/parse_date.c"
-yy1559:
+#line 22405 "ext/date/lib/parse_date.c"
+yy1499:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -23315,7 +22411,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'M') goto yy167;
-			goto yy1565;
+			goto yy1505;
 		}
 	} else {
 		if (yych <= 'm') {
@@ -23323,12 +22419,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 'n') goto yy1565;
+			if (yych <= 'n') goto yy1505;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1560:
+yy1500:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -23363,13 +22459,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'e') goto yy1561;
+				if (yych <= 'e') goto yy1501;
 				if (yych <= 'z') goto yy167;
 				goto yy218;
 			}
 		}
 	}
-yy1561:
+yy1501:
 	yych = *++YYCURSOR;
 	if (yych <= 'M') {
 		if (yych <= ')') {
@@ -23385,12 +22481,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'm') goto yy1562;
+			if (yych <= 'm') goto yy1502;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1562:
+yy1502:
 	yych = *++YYCURSOR;
 	if (yych <= 'B') {
 		if (yych <= ')') {
@@ -23406,36 +22502,36 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'b') goto yy1563;
+			if (yych <= 'b') goto yy1503;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1563:
+yy1503:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'E') goto yy1564;
+		if (yych <= 'E') goto yy1504;
 		if (yych != 'e') goto yy3;
 	}
-yy1564:
+yy1504:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy230;
-	if (yych == 'r') goto yy230;
+	if (yych == 'R') goto yy229;
+	if (yych == 'r') goto yy229;
 	goto yy56;
-yy1565:
+yy1505:
 	++YYCURSOR;
 	if ((yych = *YYCURSOR) <= '@') {
 		if (yych == ')') goto yy164;
 	} else {
 		if (yych <= 'Z') goto yy168;
-		if (yych <= '`') goto yy1566;
+		if (yych <= '`') goto yy1506;
 		if (yych <= 'z') goto yy168;
 	}
-yy1566:
+yy1506:
 #line 991 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("noon");
@@ -23447,8 +22543,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 23451 "ext/date/lib/parse_date.c"
-yy1567:
+#line 22547 "ext/date/lib/parse_date.c"
+yy1507:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'V') {
@@ -23466,15 +22562,15 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy3;
 				goto yy166;
 			} else {
-				if (yych <= 'O') goto yy1559;
+				if (yych <= 'O') goto yy1499;
 				if (yych <= 'U') goto yy166;
-				goto yy1560;
+				goto yy1500;
 			}
 		}
 	} else {
 		if (yych <= 'n') {
 			if (yych <= '^') {
-				if (yych <= 'W') goto yy1557;
+				if (yych <= 'W') goto yy1497;
 				if (yych <= 'Z') goto yy166;
 				goto yy3;
 			} else {
@@ -23484,17 +22580,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			}
 		} else {
 			if (yych <= 'v') {
-				if (yych <= 'o') goto yy1574;
+				if (yych <= 'o') goto yy1514;
 				if (yych <= 'u') goto yy171;
-				goto yy1575;
+				goto yy1515;
 			} else {
-				if (yych <= 'w') goto yy1573;
+				if (yych <= 'w') goto yy1513;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1568:
+yy1508:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
@@ -23509,7 +22605,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'X') goto yy1556;
+			if (yych <= 'X') goto yy1496;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -23518,13 +22614,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'x') goto yy1572;
+				if (yych <= 'x') goto yy1512;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1569:
+yy1509:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -23539,7 +22635,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1554;
+			if (yych <= 'N') goto yy1494;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -23548,13 +22644,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 'n') goto yy1570;
+				if (yych <= 'n') goto yy1510;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1570:
+yy1510:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -23569,7 +22665,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1555;
+			if (yych <= 'T') goto yy1495;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -23578,13 +22674,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 't') goto yy1571;
+				if (yych <= 't') goto yy1511;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1571:
+yy1511:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -23599,7 +22695,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'H') goto yy1288;
+			if (yych <= 'H') goto yy1228;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -23608,13 +22704,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'h') goto yy1317;
+				if (yych <= 'h') goto yy1257;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1572:
+yy1512:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -23629,7 +22725,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1486;
+			if (yych <= 'T') goto yy1426;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -23638,36 +22734,36 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 't') goto yy1518;
+				if (yych <= 't') goto yy1458;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1573:
-	yyaccept = 32;
+yy1513:
+	yyaccept = 31;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
 			if (yych == ')') goto yy164;
-			goto yy1558;
+			goto yy1498;
 		} else {
-			if (yych == '.') goto yy1558;
+			if (yych == '.') goto yy1498;
 			goto yy172;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy1558;
+			if (yych <= '@') goto yy1498;
 			if (yych <= 'Z') goto yy167;
-			goto yy1558;
+			goto yy1498;
 		} else {
 			if (yych <= '_') goto yy172;
-			if (yych <= '`') goto yy1558;
+			if (yych <= '`') goto yy1498;
 			if (yych <= 'z') goto yy175;
-			goto yy1558;
+			goto yy1498;
 		}
 	}
-yy1574:
+yy1514:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -23682,7 +22778,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1565;
+			if (yych <= 'N') goto yy1505;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -23691,13 +22787,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 'n') goto yy1580;
+				if (yych <= 'n') goto yy1520;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1575:
+yy1515:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -23713,7 +22809,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '-') {
 				if (yych <= ')') goto yy164;
 				if (yych <= ',') goto yy218;
-				goto yy396;
+				goto yy336;
 			} else {
 				if (yych == '/') goto yy172;
 				goto yy220;
@@ -23725,7 +22821,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '@') goto yy218;
 				goto yy167;
 			} else {
-				if (yych <= 'E') goto yy1561;
+				if (yych <= 'E') goto yy1501;
 				if (yych <= 'Z') goto yy167;
 				goto yy218;
 			}
@@ -23735,13 +22831,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy218;
 				goto yy175;
 			} else {
-				if (yych <= 'e') goto yy1576;
+				if (yych <= 'e') goto yy1516;
 				if (yych <= 'z') goto yy175;
 				goto yy218;
 			}
 		}
 	}
-yy1576:
+yy1516:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'L') {
@@ -23756,7 +22852,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'M') goto yy1562;
+			if (yych <= 'M') goto yy1502;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -23765,13 +22861,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'm') goto yy1577;
+				if (yych <= 'm') goto yy1517;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1577:
+yy1517:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'A') {
@@ -23786,7 +22882,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'B') goto yy1563;
+			if (yych <= 'B') goto yy1503;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -23795,13 +22891,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'b') goto yy1578;
+				if (yych <= 'b') goto yy1518;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1578:
+yy1518:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -23815,44 +22911,44 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'E') goto yy1564;
+			if (yych <= 'E') goto yy1504;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 'e') goto yy1579;
+			if (yych == 'e') goto yy1519;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy1579:
+yy1519:
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy230;
-	if (yych == 'r') goto yy401;
+	if (yych == 'R') goto yy229;
+	if (yych == 'r') goto yy341;
 	goto yy179;
-yy1580:
-	yyaccept = 33;
+yy1520:
+	yyaccept = 32;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
 			if (yych == ')') goto yy164;
-			goto yy1566;
+			goto yy1506;
 		} else {
-			if (yych == '.') goto yy1566;
+			if (yych == '.') goto yy1506;
 			goto yy172;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy1566;
+			if (yych <= '@') goto yy1506;
 			if (yych <= 'Z') goto yy168;
-			goto yy1566;
+			goto yy1506;
 		} else {
 			if (yych <= '_') goto yy172;
-			if (yych <= '`') goto yy1566;
+			if (yych <= '`') goto yy1506;
 			if (yych <= 'z') goto yy176;
-			goto yy1566;
+			goto yy1506;
 		}
 	}
-yy1581:
+yy1521:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -23868,12 +22964,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy166;
 		} else {
-			if (yych <= 's') goto yy1582;
+			if (yych <= 's') goto yy1522;
 			if (yych <= 'z') goto yy166;
 			goto yy3;
 		}
 	}
-yy1582:
+yy1522:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -23889,12 +22985,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy167;
 		} else {
-			if (yych <= 't') goto yy1583;
+			if (yych <= 't') goto yy1523;
 			if (yych <= 'z') goto yy167;
 			goto yy3;
 		}
 	}
-yy1583:
+yy1523:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -23910,12 +23006,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy168;
 		} else {
-			if (yych <= 'e') goto yy1584;
+			if (yych <= 'e') goto yy1524;
 			if (yych <= 'z') goto yy168;
 			goto yy3;
 		}
 	}
-yy1584:
+yy1524:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -23931,32 +23027,32 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 			if (yych <= '`') goto yy3;
 			goto yy169;
 		} else {
-			if (yych <= 'r') goto yy1585;
+			if (yych <= 'r') goto yy1525;
 			if (yych <= 'z') goto yy169;
 			goto yy3;
 		}
 	}
-yy1585:
+yy1525:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
 		if (yych == ')') goto yy164;
 		goto yy3;
 	} else {
-		if (yych <= 'D') goto yy1586;
+		if (yych <= 'D') goto yy1526;
 		if (yych != 'd') goto yy3;
 	}
-yy1586:
+yy1526:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1587;
+	if (yych == 'A') goto yy1527;
 	if (yych != 'a') goto yy56;
-yy1587:
+yy1527:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1588;
+	if (yych == 'Y') goto yy1528;
 	if (yych != 'y') goto yy56;
-yy1588:
+yy1528:
 	++YYCURSOR;
-yy1589:
+yy1529:
 #line 970 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("yesterday");
@@ -23968,8 +23064,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 23972 "ext/date/lib/parse_date.c"
-yy1590:
+#line 23068 "ext/date/lib/parse_date.c"
+yy1530:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
@@ -23984,7 +23080,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy1582;
+			if (yych <= 'S') goto yy1522;
 			if (yych <= 'Z') goto yy166;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -23993,13 +23089,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy171;
 			} else {
-				if (yych <= 's') goto yy1591;
+				if (yych <= 's') goto yy1531;
 				if (yych <= 'z') goto yy171;
 				goto yy3;
 			}
 		}
 	}
-yy1591:
+yy1531:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -24014,7 +23110,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1583;
+			if (yych <= 'T') goto yy1523;
 			if (yych <= 'Z') goto yy167;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -24023,13 +23119,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy175;
 			} else {
-				if (yych <= 't') goto yy1592;
+				if (yych <= 't') goto yy1532;
 				if (yych <= 'z') goto yy175;
 				goto yy3;
 			}
 		}
 	}
-yy1592:
+yy1532:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -24044,7 +23140,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy1584;
+			if (yych <= 'E') goto yy1524;
 			if (yych <= 'Z') goto yy168;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -24053,13 +23149,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy176;
 			} else {
-				if (yych <= 'e') goto yy1593;
+				if (yych <= 'e') goto yy1533;
 				if (yych <= 'z') goto yy176;
 				goto yy3;
 			}
 		}
 	}
-yy1593:
+yy1533:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -24074,7 +23170,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy1585;
+			if (yych <= 'R') goto yy1525;
 			if (yych <= 'Z') goto yy169;
 			if (yych <= '^') goto yy3;
 			goto yy172;
@@ -24083,13 +23179,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 				if (yych <= '`') goto yy3;
 				goto yy177;
 			} else {
-				if (yych <= 'r') goto yy1594;
+				if (yych <= 'r') goto yy1534;
 				if (yych <= 'z') goto yy177;
 				goto yy3;
 			}
 		}
 	}
-yy1594:
+yy1534:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -24103,41 +23199,41 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'D') goto yy1586;
+			if (yych <= 'D') goto yy1526;
 			if (yych == '_') goto yy172;
 			goto yy3;
 		} else {
-			if (yych == 'd') goto yy1595;
+			if (yych == 'd') goto yy1535;
 			if (yych <= 'z') goto yy178;
 			goto yy3;
 		}
 	}
-yy1595:
+yy1535:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1587;
+	if (yych == 'A') goto yy1527;
 	if (yych != 'a') goto yy179;
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1588;
+	if (yych == 'Y') goto yy1528;
 	if (yych != 'y') goto yy179;
-	yyaccept = 34;
+	yyaccept = 33;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 16) {
 		goto yy178;
 	}
 	if (yych <= '.') {
 		if (yych == '-') goto yy172;
-		goto yy1589;
+		goto yy1529;
 	} else {
 		if (yych <= '/') goto yy172;
 		if (yych == '_') goto yy172;
-		goto yy1589;
+		goto yy1529;
 	}
 }
 #line 1772 "ext/date/lib/parse_date.re"
 
 }
 
-#define YYMAXFILL 31
+#define YYMAXFILL 33
 
 timelib_time* timelib_strtotime(char *s, size_t len, struct timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper)
 {
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index 4bd828295ffce..74d9ea3a0fb2c 100644
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -913,7 +913,7 @@ datefull         = day ([ \t.-])* monthtext ([ \t.-])* year;
 datenoday        = monthtext ([ .\t-])* year4;
 datenodayrev     = year4 ([ .\t-])* monthtext;
 datetextual      = monthtext ([ .\t-])* day [,.stndrh\t ]+ year;
-datenoyear       = monthtext ([ .\t-])* day [,.stndrh\t ]*;
+datenoyear       = monthtext ([ .\t-])* day ([,.stndrh\t ]+|[\000]);
 datenoyearrev    = day ([ .\t-])* monthtext;
 datenocolon      = year4 monthlz daylz;
 
diff --git a/ext/date/tests/date-time-modify-times.phpt b/ext/date/tests/date-time-modify-times.phpt
index 258ddbd420b16..e355f18e06b80 100644
--- a/ext/date/tests/date-time-modify-times.phpt
+++ b/ext/date/tests/date-time-modify-times.phpt
@@ -34,14 +34,14 @@ foreach ( $tests as $start => $data )
 echo "\n";
 ?>
 --EXPECT--
-Sat, 23 Oct 2010 00:00:00 +0000
+Fri, 15 Oct 2010 23:00:00 +0000
 Wed, 15 Dec 2010 16:15:00 +0000
 Mon, 20 Dec 2010 00:00:00 +0000
 Mon, 20 Dec 2010 10:00:00 +0000
 Tue, 21 Dec 2010 12:00:00 +0000
 Mon, 03 Jan 2011 00:00:00 +0000
 Mon, 03 Jan 2011 09:00:00 +0000
-Sat, 23 Oct 2010 00:00:00 +0100
+Fri, 15 Oct 2010 23:00:00 +0100
 Sun, 28 Mar 2010 00:15:00 +0000
 Sun, 28 Mar 2010 02:15:00 +0100
 Sun, 28 Mar 2010 02:15:00 +0100
diff --git a/ext/gd/libgd/gd_gif_in.c b/ext/gd/libgd/gd_gif_in.c
index 0111a3ee78c26..262350ef44e3b 100644
--- a/ext/gd/libgd/gd_gif_in.c
+++ b/ext/gd/libgd/gd_gif_in.c
@@ -148,6 +148,9 @@ gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr fd) /* {{{ */
 	int haveGlobalColormap;
 	gdImagePtr im = 0;
 
+	memset(ColorMap, 0, 3 * MAXCOLORMAPSIZE);
+	memset(localColorMap, 0, 3 * MAXCOLORMAPSIZE);
+
 	/*1.4//imageNumber = 1; */
 	if (! ReadOK(fd,buf,6)) {
 		return 0;
diff --git a/ext/gd/tests/bug74435.gif b/ext/gd/tests/bug74435.gif
new file mode 100644
index 0000000000000..92fbb7ff20d57
Binary files /dev/null and b/ext/gd/tests/bug74435.gif differ
diff --git a/ext/gd/tests/bug74435.phpt b/ext/gd/tests/bug74435.phpt
new file mode 100644
index 0000000000000..9d11eb3839f2d
--- /dev/null
+++ b/ext/gd/tests/bug74435.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Bug #74435 (Buffer over-read into uninitialized memory)
+--SKIPIF--
+<?php
+if (!extension_loaded('gd')) die('skip gd extension not available');
+?>
+--FILE--
+<?php
+$im = imagecreatefromgif(__DIR__ . DIRECTORY_SEPARATOR . 'bug74435.gif');
+var_dump($im);
+$width = imagesx($im);
+$height = imagesy($im);
+for ($i = 0; $i < $width; $i += 16) {
+    for ($j = 0; $j < $height; $j += 16) {
+        if (($index = imagecolorat($im, $i, $j)) >= 2) {
+            list($red, $green, $blue, $alpha) = array_values(imagecolorsforindex($im, $index));
+            if ($red !== 0 || $green !== 0 || $blue !== 0 || $alpha !== 0) {
+                echo "unexpected color at ($i, $j)\n";
+            }
+        }
+    }
+}
+?>
+===DONE===
+--EXPECTF--
+resource(%d) of type (gd)
+===DONE===
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 81456207bd310..acdcd33598c84 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -6057,7 +6057,7 @@ PHP_FUNCTION(openssl_seal)
 	buf = emalloc(data_len + EVP_CIPHER_CTX_block_size(ctx));
 	EVP_CIPHER_CTX_cleanup(ctx);
 
-	if (!EVP_SealInit(ctx, cipher, eks, eksl, &iv_buf[0], pkeys, nkeys) ||
+	if (EVP_SealInit(ctx, cipher, eks, eksl, &iv_buf[0], pkeys, nkeys) <= 0 ||
 			!EVP_SealUpdate(ctx, buf, &len1, (unsigned char *)data, (int)data_len) ||
 			!EVP_SealFinal(ctx, buf + len1, &len2)) {
 		efree(buf);
diff --git a/ext/openssl/tests/74651.pem b/ext/openssl/tests/74651.pem
new file mode 100644
index 0000000000000..4ed5905ee54d8
--- /dev/null
+++ b/ext/openssl/tests/74651.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEoDCCBAmgAwIBAgIBJzANBgkqhkiG9w0BAQQFADCBkDELMAkGA1UEFhMCUk8x
+EDAOBgNVBAgTB1JvbWFuaWExEDAOBgNVBAcTB0NyYWlvdmExDzANBgNVBAoTBlNl
+cmdpdTETMBEGA1UECxMKU2VyZ2l1IFNSTDESMBAGA1UEAxMJU2VyZ2l1IENBMSMw
+IQYJKoZIhvcNAQkBFhRuX3NlcmdpdUBob3RtYWlsLmNvbTAeFw0wNDA1MTQxMzM0
+NTZaFw0wNTA1MTQxMzM0NTZaMIGaMQswCQYDVQQGEwJSTzEQMA4GA1UECBMHUm9t
+YW5pYTEQMA4GA1UEBxMHQ3JhaW92YTETMBEGA1UEChMKU2VyZ2l1IFNSTDETMBEG
+A1UECxMKU2VyZ2l1IFNSTDEYMBYGA1UEAxMPU2VyZ2l1IHBlcnNvbmFsMSMwIQYJ
+KoZIhvcNAQkBFhRuX3NlcmdpdUBob3RtYWlsLmNvbTCBnzANBgkqhkiG9w0BAQEF
+AAOBjQAwgYkCgYEApNj7XXz8T8FcLIWpBniPYom3QcT6T7u0xRPHqtqzj5oboBYp
+DJe5d354/y0gJTpiLt8+fTrPgWXnbHm3pOHgXzTcX6Arani0GDU0/xDi4VkCRGcS
+YqX2sJpcDzAbmK9UDMt3xf/O1B8AJan3RfO0Bm3ozTEPziLMkmsiYr5b/L4CAwEA
+AaOCAfwwggH4MAkGA1UdEwQCMAAwNQYJYIZIAYb4QgENBCgWJkZvciBHcmlkIHVz
+ZSBvbmx5OyByZXF1ZXN0IHRhZyB1c2VyVGFnMBEGCWCGSAGG+EIBAQQEAwIF4DA/
+BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vbW9iaWxlLmJsdWUtc29mdHdhcmUucm86
+OTAvY2EvY3JsLnNodG1sMDUGCWCGSAGG+EIBCAQoFiZodHRwOi8vbW9iaWxlLmJs
+dWUtc29mdHdhcmUucm86OTAvcHViLzAhBgNVHREEGjAYgRZzZXJnaXVAYmx1ZXNv
+ZnR3YXJlLnJvMB0GA1UdDgQWBBSwp//5QRXeIzm93TEPl6CyonTg/DCBpwYDVR0j
+BIGfMIGcoYGWpIGTMIGQMQswCQYDVQQGEwJSTzEQMA4GA1UECBMHUm9tYW5pYTEQ
+MA4GA1UEBxMHQ3JhaW92YTEPMA0GA1UEChMGU2VyZ2l1MRMwEQYDVQQLEwpTZXJn
+aXUgU1JMMRIwEAYDVQQDEwlTZXJnaXUgQ0ExIzAhBgkqhkiG9w0BCQEWFG5fc2Vy
+Z2l1QGhvdG1haWwuY29tggEAMAsGA1UdDwQEAwIE8DAjBglghkgBhvhCAQIEFhYU
+aHR0cDovLzYyLjIzMS45OC41Mi8wCwYDKgMEBAQ+52I0MA0GCSqGSIb3DQEBBAUA
+A4GBAIBIOJ+iiLyQfNJEY+IMefayQea0nmuXYY+F+L1DFjSC7xChytgYoPNnKkhh
+3dWPtxbswiqKYUnGi6y3Hi4UhDsOaDW29t2S305hSc2qgjOiNtRYQIVYQ8EHG1k7
+Fl63S7uCOhnVJt+4MnUK1N6/pwgsp+Z2GvEsDG1qCKnvNpf6
+-----END CERTIFICATE-----
diff --git a/ext/openssl/tests/bug74651.phpt b/ext/openssl/tests/bug74651.phpt
new file mode 100644
index 0000000000000..f86394bdd5fdf
--- /dev/null
+++ b/ext/openssl/tests/bug74651.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #74651: negative-size-param (-1) in memcpy in zif_openssl_seal()
+--SKIPIF--
+<?php
+if (!extension_loaded("openssl")) die("skip openssl not loaded");
+?>
+--FILE--
+<?php
+
+$inputstr = file_get_contents(__DIR__ . "/74651.pem");
+$pub_key_id = openssl_get_publickey($inputstr);
+var_dump($pub_key_id);
+var_dump(openssl_seal($inputstr, $sealed, $ekeys, array($pub_key_id, $pub_key_id), 'AES-128-ECB'));
+?>
+--EXPECTF--
+resource(%d) of type (OpenSSL key)
+bool(false)
\ No newline at end of file
diff --git a/ext/pcre/pcrelib/pcre_jit_compile.c b/ext/pcre/pcrelib/pcre_jit_compile.c
index 445de0cbefebc..4684be751a056 100644
--- a/ext/pcre/pcrelib/pcre_jit_compile.c
+++ b/ext/pcre/pcrelib/pcre_jit_compile.c
@@ -7307,7 +7307,7 @@ if (opcode == OP_COND || opcode == OP_SCOND)
 
     if (*matchingpath == OP_FAIL)
       stacksize = 0;
-    if (*matchingpath == OP_RREF)
+    else if (*matchingpath == OP_RREF)
       {
       stacksize = GET2(matchingpath, 1);
       if (common->currententry == NULL)
diff --git a/ext/standard/tests/serialize/bug25378.phpt b/ext/standard/tests/serialize/bug25378.phpt
index e865b96e9935f..e95a427006201 100644
--- a/ext/standard/tests/serialize/bug25378.phpt
+++ b/ext/standard/tests/serialize/bug25378.phpt
@@ -42,7 +42,7 @@ bool(false)
 Notice: unserialize(): Error at offset 17 of 33 bytes in %sbug25378.php on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 33 of 32 bytes in %sbug25378.php on line %d
+Notice: unserialize(): Error at offset 32 of 32 bytes in %sbug25378.php on line %d
 bool(false)
 
 Notice: unserialize(): Error at offset 2 of 13 bytes in %sbug25378.php on line %d
diff --git a/ext/standard/tests/serialize/bug74111.phpt b/ext/standard/tests/serialize/bug74111.phpt
new file mode 100644
index 0000000000000..62922bea55ae0
--- /dev/null
+++ b/ext/standard/tests/serialize/bug74111.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #74111: Heap buffer overread (READ: 1) finish_nested_data from unserialize
+--FILE--
+<?php
+$s = 'O:8:"stdClass":00000000';
+var_dump(unserialize($s));
+?>
+--EXPECTF--
+Notice: unserialize(): Error at offset 25 of 23 bytes in %s on line %d
+bool(false)
diff --git a/ext/standard/tests/strings/bug70436.phpt b/ext/standard/tests/strings/bug70436.phpt
index 1273ee30c6bd4..7d6d0f18d9179 100644
--- a/ext/standard/tests/strings/bug70436.phpt
+++ b/ext/standard/tests/strings/bug70436.phpt
@@ -48,7 +48,7 @@ DONE
 --EXPECTF--
 Notice: unserialize(): Error at offset 0 of 3 bytes in %sbug70436.php on line %d
 
-Notice: unserialize(): Error at offset 17 of 17 bytes in %sbug70436.php on line %d
+Notice: unserialize(): Error at offset 16 of 17 bytes in %sbug70436.php on line %d
 
 Notice: unserialize(): Error at offset 93 of 94 bytes in %sbug70436.php on line %d
 bool(false)
diff --git a/ext/standard/tests/strings/bug72663_3.phpt b/ext/standard/tests/strings/bug72663_3.phpt
index 087af8f068ca9..3b949b0239271 100644
--- a/ext/standard/tests/strings/bug72663_3.phpt
+++ b/ext/standard/tests/strings/bug72663_3.phpt
@@ -14,5 +14,5 @@ unserialize($poc);
 ?>
 DONE
 --EXPECTF--
-Notice: unserialize(): Error at offset 51 of 50 bytes in %sbug72663_3.php on line %d
+Notice: unserialize(): Error at offset 50 of 50 bytes in %sbug72663_3.php on line %d
 DONE
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
deleted file mode 100644
index 777f714c60666..0000000000000
--- a/ext/standard/var_unserializer.c
+++ /dev/null
@@ -1,1427 +0,0 @@
-/* Generated by re2c 0.16 */
-#line 1 "ext/standard/var_unserializer.re"
-/*
-  +----------------------------------------------------------------------+
-  | PHP Version 7                                                        |
-  +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2017 The PHP Group                                |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.01 of the PHP license,      |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_01.txt                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | license@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Author: Sascha Schumann <sascha@schumann.cx>                         |
-  +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#include "php.h"
-#include "ext/standard/php_var.h"
-#include "php_incomplete_class.h"
-#include "zend_portability.h"
-
-struct php_unserialize_data {
-	void *first;
-	void *last;
-	void *first_dtor;
-	void *last_dtor;
-	HashTable *allowed_classes;
-};
-
-PHPAPI php_unserialize_data_t php_var_unserialize_init() {
-	php_unserialize_data_t d;
-	/* fprintf(stderr, "UNSERIALIZE_INIT    == lock: %u, level: %u\n", BG(serialize_lock), BG(unserialize).level); */
-	if (BG(serialize_lock) || !BG(unserialize).level) {
-		d = ecalloc(1, sizeof(struct php_unserialize_data));
-		if (!BG(serialize_lock)) {
-			BG(unserialize).data = d;
-			BG(unserialize).level = 1;
-		}
-	} else {
-		d = BG(unserialize).data;
-		++BG(unserialize).level;
-	}
-	return d;
-}
-
-PHPAPI void php_var_unserialize_destroy(php_unserialize_data_t d) {
-	/* fprintf(stderr, "UNSERIALIZE_DESTROY == lock: %u, level: %u\n", BG(serialize_lock), BG(unserialize).level); */
-	if (BG(serialize_lock) || BG(unserialize).level == 1) {
-		var_destroy(&d);
-		efree(d);
-	}
-	if (!BG(serialize_lock) && !--BG(unserialize).level) {
-		BG(unserialize).data = NULL;
-	}
-}
-
-PHPAPI HashTable *php_var_unserialize_get_allowed_classes(php_unserialize_data_t d) {
-	return d->allowed_classes;
-}
-PHPAPI void php_var_unserialize_set_allowed_classes(php_unserialize_data_t d, HashTable *classes) {
-	d->allowed_classes = classes;
-}
-
-
-/* {{{ reference-handling for unserializer: var_* */
-#define VAR_ENTRIES_MAX 1024
-#define VAR_ENTRIES_DBG 0
-
-/* VAR_FLAG used in var_dtor entries to signify an entry on which __wakeup should be called */
-#define VAR_WAKEUP_FLAG 1
-
-typedef struct {
-	zval *data[VAR_ENTRIES_MAX];
-	zend_long used_slots;
-	void *next;
-} var_entries;
-
-typedef struct {
-	zval data[VAR_ENTRIES_MAX];
-	zend_long used_slots;
-	void *next;
-} var_dtor_entries;
-
-static inline void var_push(php_unserialize_data_t *var_hashx, zval *rval)
-{
-	var_entries *var_hash = (*var_hashx)->last;
-#if VAR_ENTRIES_DBG
-	fprintf(stderr, "var_push(%ld): %d\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_P(rval));
-#endif
-
-	if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) {
-		var_hash = emalloc(sizeof(var_entries));
-		var_hash->used_slots = 0;
-		var_hash->next = 0;
-
-		if (!(*var_hashx)->first) {
-			(*var_hashx)->first = var_hash;
-		} else {
-			((var_entries *) (*var_hashx)->last)->next = var_hash;
-		}
-
-		(*var_hashx)->last = var_hash;
-	}
-
-	var_hash->data[var_hash->used_slots++] = rval;
-}
-
-PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval *rval)
-{
-	zval *tmp_var = var_tmp_var(var_hashx);
-    if (!tmp_var) {
-        return;
-    }
-	ZVAL_COPY(tmp_var, rval);
-}
-
-PHPAPI zval *var_tmp_var(php_unserialize_data_t *var_hashx)
-{
-    var_dtor_entries *var_hash;
-
-    if (!var_hashx || !*var_hashx) {
-        return NULL;
-    }
-
-    var_hash = (*var_hashx)->last_dtor;
-    if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) {
-        var_hash = emalloc(sizeof(var_dtor_entries));
-        var_hash->used_slots = 0;
-        var_hash->next = 0;
-
-        if (!(*var_hashx)->first_dtor) {
-            (*var_hashx)->first_dtor = var_hash;
-        } else {
-            ((var_dtor_entries *) (*var_hashx)->last_dtor)->next = var_hash;
-        }
-
-        (*var_hashx)->last_dtor = var_hash;
-    }
-    ZVAL_UNDEF(&var_hash->data[var_hash->used_slots]);
-	Z_EXTRA(var_hash->data[var_hash->used_slots]) = 0;
-    return &var_hash->data[var_hash->used_slots++];
-}
-
-PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval *nzval)
-{
-	zend_long i;
-	var_entries *var_hash = (*var_hashx)->first;
-#if VAR_ENTRIES_DBG
-	fprintf(stderr, "var_replace(%ld): %d\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_P(nzval));
-#endif
-
-	while (var_hash) {
-		for (i = 0; i < var_hash->used_slots; i++) {
-			if (var_hash->data[i] == ozval) {
-				var_hash->data[i] = nzval;
-				/* do not break here */
-			}
-		}
-		var_hash = var_hash->next;
-	}
-}
-
-static zval *var_access(php_unserialize_data_t *var_hashx, zend_long id)
-{
-	var_entries *var_hash = (*var_hashx)->first;
-#if VAR_ENTRIES_DBG
-	fprintf(stderr, "var_access(%ld): %ld\n", var_hash?var_hash->used_slots:-1L, id);
-#endif
-
-	while (id >= VAR_ENTRIES_MAX && var_hash && var_hash->used_slots == VAR_ENTRIES_MAX) {
-		var_hash = var_hash->next;
-		id -= VAR_ENTRIES_MAX;
-	}
-
-	if (!var_hash) return NULL;
-
-	if (id < 0 || id >= var_hash->used_slots) return NULL;
-
-	return var_hash->data[id];
-}
-
-PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
-{
-	void *next;
-	zend_long i;
-	var_entries *var_hash = (*var_hashx)->first;
-	var_dtor_entries *var_dtor_hash = (*var_hashx)->first_dtor;
-	zend_bool wakeup_failed = 0;
-	zval wakeup_name;
-	ZVAL_UNDEF(&wakeup_name);
-
-#if VAR_ENTRIES_DBG
-	fprintf(stderr, "var_destroy(%ld)\n", var_hash?var_hash->used_slots:-1L);
-#endif
-
-	while (var_hash) {
-		next = var_hash->next;
-		efree_size(var_hash, sizeof(var_entries));
-		var_hash = next;
-	}
-
-	while (var_dtor_hash) {
-		for (i = 0; i < var_dtor_hash->used_slots; i++) {
-			zval *zv = &var_dtor_hash->data[i];
-#if VAR_ENTRIES_DBG
-			fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_dtor_hash->data[i], Z_REFCOUNT_P(var_dtor_hash->data[i]));
-#endif
-
-			/* Perform delayed __wakeup calls */
-			if (Z_EXTRA_P(zv) == VAR_WAKEUP_FLAG) {
-				if (!wakeup_failed) {
-					zval retval;
-					if (Z_ISUNDEF(wakeup_name)) {
-						ZVAL_STRINGL(&wakeup_name, "__wakeup", sizeof("__wakeup") - 1);
-					}
-
-					BG(serialize_lock)++;
-					if (call_user_function_ex(CG(function_table), zv, &wakeup_name, &retval, 0, 0, 1, NULL) == FAILURE || Z_ISUNDEF(retval)) {
-						wakeup_failed = 1;
-						GC_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED;
-					}
-					BG(serialize_lock)--;
-
-					zval_ptr_dtor(&retval);
-				} else {
-					GC_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED;
-				}
-			}
-
-			i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC);
-		}
-		next = var_dtor_hash->next;
-		efree_size(var_dtor_hash, sizeof(var_dtor_entries));
-		var_dtor_hash = next;
-	}
-
-	zval_ptr_dtor_nogc(&wakeup_name);
-}
-
-/* }}} */
-
-static zend_string *unserialize_str(const unsigned char **p, size_t len, size_t maxlen)
-{
-	size_t i, j;
-	zend_string *str = zend_string_safe_alloc(1, len, 0, 0);
-	unsigned char *end = *(unsigned char **)p+maxlen;
-
-	if (end < *p) {
-		zend_string_free(str);
-		return NULL;
-	}
-
-	for (i = 0; i < len; i++) {
-		if (*p >= end) {
-			zend_string_free(str);
-			return NULL;
-		}
-		if (**p != '\\') {
-			ZSTR_VAL(str)[i] = (char)**p;
-		} else {
-			unsigned char ch = 0;
-
-			for (j = 0; j < 2; j++) {
-				(*p)++;
-				if (**p >= '0' && **p <= '9') {
-					ch = (ch << 4) + (**p -'0');
-				} else if (**p >= 'a' && **p <= 'f') {
-					ch = (ch << 4) + (**p -'a'+10);
-				} else if (**p >= 'A' && **p <= 'F') {
-					ch = (ch << 4) + (**p -'A'+10);
-				} else {
-					zend_string_free(str);
-					return NULL;
-				}
-			}
-			ZSTR_VAL(str)[i] = (char)ch;
-		}
-		(*p)++;
-	}
-	ZSTR_VAL(str)[i] = 0;
-	ZSTR_LEN(str) = i;
-	return str;
-}
-
-static inline int unserialize_allowed_class(
-		zend_string *class_name, php_unserialize_data_t *var_hashx)
-{
-	HashTable *classes = (*var_hashx)->allowed_classes;
-	zend_string *lcname;
-	int res;
-	ALLOCA_FLAG(use_heap)
-
-	if(classes == NULL) {
-		return 1;
-	}
-	if(!zend_hash_num_elements(classes)) {
-		return 0;
-	}
-
-	ZSTR_ALLOCA_ALLOC(lcname, ZSTR_LEN(class_name), use_heap);
-	zend_str_tolower_copy(ZSTR_VAL(lcname), ZSTR_VAL(class_name), ZSTR_LEN(class_name));
-	res = zend_hash_exists(classes, lcname);
-	ZSTR_ALLOCA_FREE(lcname, use_heap);
-	return res;
-}
-
-#define YYFILL(n) do { } while (0)
-#define YYCTYPE unsigned char
-#define YYCURSOR cursor
-#define YYLIMIT limit
-#define YYMARKER marker
-
-
-#line 325 "ext/standard/var_unserializer.re"
-
-
-
-
-static inline zend_long parse_iv2(const unsigned char *p, const unsigned char **q)
-{
-	char cursor;
-	zend_long result = 0;
-	int neg = 0;
-
-	switch (*p) {
-		case '-':
-			neg++;
-			/* fall-through */
-		case '+':
-			p++;
-	}
-
-	while (1) {
-		cursor = (char)*p;
-		if (cursor >= '0' && cursor <= '9') {
-			result = result * 10 + (size_t)(cursor - (unsigned char)'0');
-		} else {
-			break;
-		}
-		p++;
-	}
-	if (q) *q = p;
-	if (neg) return -result;
-	return result;
-}
-
-static inline zend_long parse_iv(const unsigned char *p)
-{
-	return parse_iv2(p, NULL);
-}
-
-/* no need to check for length - re2c already did */
-static inline size_t parse_uiv(const unsigned char *p)
-{
-	unsigned char cursor;
-	size_t result = 0;
-
-	while (1) {
-		cursor = *p;
-		if (cursor >= '0' && cursor <= '9') {
-			result = result * 10 + (size_t)(cursor - (unsigned char)'0');
-		} else {
-			break;
-		}
-		p++;
-	}
-	return result;
-}
-
-#define UNSERIALIZE_PARAMETER zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash
-#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash
-
-static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER);
-
-static zend_always_inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, zend_long elements, int objprops)
-{
-	while (elements-- > 0) {
-		zval key, *data, d, *old_data;
-		zend_ulong idx;
-
-		ZVAL_UNDEF(&key);
-
-		if (!php_var_unserialize_internal(&key, p, max, NULL)) {
-			zval_dtor(&key);
-			return 0;
-		}
-
-		data = NULL;
-		ZVAL_UNDEF(&d);
-
-		if (!objprops) {
-			if (Z_TYPE(key) == IS_LONG) {
-				idx = Z_LVAL(key);
-numeric_key:
-				if (UNEXPECTED((old_data = zend_hash_index_find(ht, idx)) != NULL)) {
-					//??? update hash
-					var_push_dtor(var_hash, old_data);
-					data = zend_hash_index_update(ht, idx, &d);
-				} else {
-					data = zend_hash_index_add_new(ht, idx, &d);
-				}
-			} else if (Z_TYPE(key) == IS_STRING) {
-				if (UNEXPECTED(ZEND_HANDLE_NUMERIC(Z_STR(key), idx))) {
-					goto numeric_key;
-				}
-				if (UNEXPECTED((old_data = zend_hash_find(ht, Z_STR(key))) != NULL)) {
-					//??? update hash
-					var_push_dtor(var_hash, old_data);
-					data = zend_hash_update(ht, Z_STR(key), &d);
-				} else {
-					data = zend_hash_add_new(ht, Z_STR(key), &d);
-				}
-			} else {
-				zval_dtor(&key);
-				return 0;
-			}
-		} else {
-			if (EXPECTED(Z_TYPE(key) == IS_STRING)) {
-string_key:
-				if ((old_data = zend_hash_find(ht, Z_STR(key))) != NULL) {
-					if (Z_TYPE_P(old_data) == IS_INDIRECT) {
-						old_data = Z_INDIRECT_P(old_data);
-					}
-					var_push_dtor(var_hash, old_data);
-					data = zend_hash_update_ind(ht, Z_STR(key), &d);
-				} else {
-					data = zend_hash_add_new(ht, Z_STR(key), &d);
-				}
-			} else if (Z_TYPE(key) == IS_LONG) {
-				/* object properties should include no integers */
-				convert_to_string(&key);
-				goto string_key;
-			} else {
-				zval_dtor(&key);
-				return 0;
-			}
-		}
-
-		if (!php_var_unserialize_internal(data, p, max, var_hash)) {
-			zval_dtor(&key);
-			return 0;
-		}
-
-		if (UNEXPECTED(Z_ISUNDEF_P(data))) {
-			if (Z_TYPE(key) == IS_LONG) {
-				zend_hash_index_del(ht, Z_LVAL(key));
-			} else {
-				zend_hash_del_ind(ht, Z_STR(key));
-			}
-		} else {
-			var_push_dtor(var_hash, data);
-		}
-
-		zval_dtor(&key);
-
-		if (elements && *(*p-1) != ';' && *(*p-1) != '}') {
-			(*p)--;
-			return 0;
-		}
-	}
-
-	return 1;
-}
-
-static inline int finish_nested_data(UNSERIALIZE_PARAMETER)
-{
-	if (*((*p)++) == '}')
-		return 1;
-
-#if SOMETHING_NEW_MIGHT_LEAD_TO_CRASH_ENABLE_IF_YOU_ARE_BRAVE
-	zval_ptr_dtor(rval);
-#endif
-	return 0;
-}
-
-static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
-{
-	zend_long datalen;
-
-	datalen = parse_iv2((*p) + 2, p);
-
-	(*p) += 2;
-
-	if (datalen < 0 || (max - (*p)) <= datalen) {
-		zend_error(E_WARNING, "Insufficient data for unserializing - " ZEND_LONG_FMT " required, " ZEND_LONG_FMT " present", datalen, (zend_long)(max - (*p)));
-		return 0;
-	}
-
-	if (ce->unserialize == NULL) {
-		zend_error(E_WARNING, "Class %s has no unserializer", ZSTR_VAL(ce->name));
-		object_init_ex(rval, ce);
-	} else if (ce->unserialize(rval, ce, (const unsigned char*)*p, datalen, (zend_unserialize_data *)var_hash) != SUCCESS) {
-		return 0;
-	}
-
-	(*p) += datalen;
-
-	return finish_nested_data(UNSERIALIZE_PASSTHRU);
-}
-
-static inline zend_long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
-{
-	zend_long elements;
-
-	if( *p >= max - 2) {
-		zend_error(E_WARNING, "Bad unserialize data");
-		return -1;
-	}
-
-	elements = parse_iv2((*p) + 2, p);
-
-	(*p) += 2;
-
-	if (ce->serialize == NULL) {
-		object_init_ex(rval, ce);
-	} else {
-		/* If this class implements Serializable, it should not land here but in object_custom(). The passed string
-		obviously doesn't descend from the regular serializer. */
-		zend_error(E_WARNING, "Erroneous data format for unserializing '%s'", ZSTR_VAL(ce->name));
-		return -1;
-	}
-
-	return elements;
-}
-
-#ifdef PHP_WIN32
-# pragma optimize("", off)
-#endif
-static inline int object_common2(UNSERIALIZE_PARAMETER, zend_long elements)
-{
-	HashTable *ht;
-	zend_bool has_wakeup;
-
-	if (Z_TYPE_P(rval) != IS_OBJECT) {
-		return 0;
-	}
-
-	has_wakeup = Z_OBJCE_P(rval) != PHP_IC_ENTRY
-		&& zend_hash_str_exists(&Z_OBJCE_P(rval)->function_table, "__wakeup", sizeof("__wakeup")-1);
-
-	ht = Z_OBJPROP_P(rval);
-	if (elements >= HT_MAX_SIZE - zend_hash_num_elements(ht)) {
-		return 0;
-	}
-
-	zend_hash_extend(ht, zend_hash_num_elements(ht) + elements, (ht->u.flags & HASH_FLAG_PACKED));
-	if (!process_nested_data(UNSERIALIZE_PASSTHRU, ht, elements, 1)) {
-		if (has_wakeup) {
-			ZVAL_DEREF(rval);
-			GC_FLAGS(Z_OBJ_P(rval)) |= IS_OBJ_DESTRUCTOR_CALLED;
-		}
-		return 0;
-	}
-
-	ZVAL_DEREF(rval);
-	if (has_wakeup) {
-		/* Delay __wakeup call until end of serialization */
-		zval *wakeup_var = var_tmp_var(var_hash);
-		ZVAL_COPY(wakeup_var, rval);
-		Z_EXTRA_P(wakeup_var) = VAR_WAKEUP_FLAG;
-	}
-
-	return finish_nested_data(UNSERIALIZE_PASSTHRU);
-}
-#ifdef PHP_WIN32
-# pragma optimize("", on)
-#endif
-
-PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
-{
-	var_entries *orig_var_entries = (*var_hash)->last;
-	zend_long orig_used_slots = orig_var_entries ? orig_var_entries->used_slots : 0;
-	int result;
-
-	result = php_var_unserialize_internal(UNSERIALIZE_PASSTHRU);
-
-	if (!result) {
-		/* If the unserialization failed, mark all elements that have been added to var_hash
-		 * as NULL. This will forbid their use by other unserialize() calls in the same
-		 * unserialization context. */
-		var_entries *e = orig_var_entries;
-		zend_long s = orig_used_slots;
-		while (e) {
-			for (; s < e->used_slots; s++) {
-				e->data[s] = NULL;
-			}
-
-			e = e->next;
-			s = 0;
-		}
-	}
-
-	return result;
-}
-
-static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER)
-{
-	const unsigned char *cursor, *limit, *marker, *start;
-	zval *rval_ref;
-
-	limit = max;
-	cursor = *p;
-
-	if (YYCURSOR >= YYLIMIT) {
-		return 0;
-	}
-
-	if (var_hash && (*p)[0] != 'R') {
-		var_push(var_hash, rval);
-	}
-
-	start = cursor;
-
-
-#line 622 "ext/standard/var_unserializer.c"
-{
-	YYCTYPE yych;
-	static const unsigned char yybm[] = {
-		  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,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128,   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,   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, 
-		  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,   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,   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,   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,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-	};
-	if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-	yych = *YYCURSOR;
-	switch (yych) {
-	case 'C':
-	case 'O':	goto yy4;
-	case 'N':	goto yy5;
-	case 'R':	goto yy6;
-	case 'S':	goto yy7;
-	case 'a':	goto yy8;
-	case 'b':	goto yy9;
-	case 'd':	goto yy10;
-	case 'i':	goto yy11;
-	case 'o':	goto yy12;
-	case 'r':	goto yy13;
-	case 's':	goto yy14;
-	case '}':	goto yy15;
-	default:	goto yy2;
-	}
-yy2:
-	++YYCURSOR;
-yy3:
-#line 1011 "ext/standard/var_unserializer.re"
-	{ return 0; }
-#line 682 "ext/standard/var_unserializer.c"
-yy4:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy17;
-	goto yy3;
-yy5:
-	yych = *++YYCURSOR;
-	if (yych == ';') goto yy19;
-	goto yy3;
-yy6:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy21;
-	goto yy3;
-yy7:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy22;
-	goto yy3;
-yy8:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy23;
-	goto yy3;
-yy9:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy24;
-	goto yy3;
-yy10:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy25;
-	goto yy3;
-yy11:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy26;
-	goto yy3;
-yy12:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy27;
-	goto yy3;
-yy13:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy28;
-	goto yy3;
-yy14:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy29;
-	goto yy3;
-yy15:
-	++YYCURSOR;
-#line 1005 "ext/standard/var_unserializer.re"
-	{
-	/* this is the case where we have less data than planned */
-	php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data");
-	return 0; /* not sure if it should be 0 or 1 here? */
-}
-#line 735 "ext/standard/var_unserializer.c"
-yy17:
-	yych = *++YYCURSOR;
-	if (yybm[0+yych] & 128) {
-		goto yy30;
-	}
-yy18:
-	YYCURSOR = YYMARKER;
-	goto yy3;
-yy19:
-	++YYCURSOR;
-#line 677 "ext/standard/var_unserializer.re"
-	{
-	*p = YYCURSOR;
-	ZVAL_NULL(rval);
-	return 1;
-}
-#line 752 "ext/standard/var_unserializer.c"
-yy21:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy32;
-	goto yy18;
-yy22:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy34;
-	goto yy18;
-yy23:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy36;
-	goto yy18;
-yy24:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '1') goto yy38;
-	goto yy18;
-yy25:
-	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych <= ',') {
-			if (yych == '+') goto yy39;
-			goto yy18;
-		} else {
-			if (yych <= '-') goto yy40;
-			if (yych <= '.') goto yy41;
-			goto yy18;
-		}
-	} else {
-		if (yych <= 'I') {
-			if (yych <= '9') goto yy42;
-			if (yych <= 'H') goto yy18;
-			goto yy44;
-		} else {
-			if (yych == 'N') goto yy45;
-			goto yy18;
-		}
-	}
-yy26:
-	yych = *++YYCURSOR;
-	if (yych <= ',') {
-		if (yych == '+') goto yy46;
-		goto yy18;
-	} else {
-		if (yych <= '-') goto yy46;
-		if (yych <= '/') goto yy18;
-		if (yych <= '9') goto yy47;
-		goto yy18;
-	}
-yy27:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy49;
-	goto yy18;
-yy28:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy51;
-	goto yy18;
-yy29:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy53;
-	goto yy18;
-yy30:
-	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm[0+yych] & 128) {
-		goto yy30;
-	}
-	if (yych <= '/') goto yy18;
-	if (yych <= ':') goto yy55;
-	goto yy18;
-yy32:
-	++YYCURSOR;
-	if (YYLIMIT <= YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy32;
-	if (yych == ';') goto yy56;
-	goto yy18;
-yy34:
-	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy34;
-	if (yych <= ':') goto yy58;
-	goto yy18;
-yy36:
-	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy36;
-	if (yych <= ':') goto yy59;
-	goto yy18;
-yy38:
-	yych = *++YYCURSOR;
-	if (yych == ';') goto yy60;
-	goto yy18;
-yy39:
-	yych = *++YYCURSOR;
-	if (yych == '.') goto yy41;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy42;
-	goto yy18;
-yy40:
-	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych != '.') goto yy18;
-	} else {
-		if (yych <= '9') goto yy42;
-		if (yych == 'I') goto yy44;
-		goto yy18;
-	}
-yy41:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy62;
-	goto yy18;
-yy42:
-	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	if (yych <= ':') {
-		if (yych <= '.') {
-			if (yych <= '-') goto yy18;
-			goto yy62;
-		} else {
-			if (yych <= '/') goto yy18;
-			if (yych <= '9') goto yy42;
-			goto yy18;
-		}
-	} else {
-		if (yych <= 'E') {
-			if (yych <= ';') goto yy64;
-			if (yych <= 'D') goto yy18;
-			goto yy66;
-		} else {
-			if (yych == 'e') goto yy66;
-			goto yy18;
-		}
-	}
-yy44:
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy67;
-	goto yy18;
-yy45:
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy68;
-	goto yy18;
-yy46:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych >= ':') goto yy18;
-yy47:
-	++YYCURSOR;
-	if (YYLIMIT <= YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy47;
-	if (yych == ';') goto yy69;
-	goto yy18;
-yy49:
-	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy49;
-	if (yych <= ':') goto yy71;
-	goto yy18;
-yy51:
-	++YYCURSOR;
-	if (YYLIMIT <= YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy51;
-	if (yych == ';') goto yy72;
-	goto yy18;
-yy53:
-	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy53;
-	if (yych <= ':') goto yy74;
-	goto yy18;
-yy55:
-	yych = *++YYCURSOR;
-	if (yych == '"') goto yy75;
-	goto yy18;
-yy56:
-	++YYCURSOR;
-#line 626 "ext/standard/var_unserializer.re"
-	{
-	zend_long id;
-
- 	*p = YYCURSOR;
-	if (!var_hash) return 0;
-
-	id = parse_uiv(start + 2) - 1;
-	if (id == -1 || (rval_ref = var_access(var_hash, id)) == NULL) {
-		return 0;
-	}
-
-	zval_ptr_dtor(rval);
-	if (Z_ISUNDEF_P(rval_ref) || (Z_ISREF_P(rval_ref) && Z_ISUNDEF_P(Z_REFVAL_P(rval_ref)))) {
-		ZVAL_UNDEF(rval);
-		return 1;
-	}
-	if (Z_ISREF_P(rval_ref)) {
-		ZVAL_COPY(rval, rval_ref);
-	} else {
-		ZVAL_NEW_REF(rval_ref, rval_ref);
-		ZVAL_COPY(rval, rval_ref);
-	}
-
-	return 1;
-}
-#line 977 "ext/standard/var_unserializer.c"
-yy58:
-	yych = *++YYCURSOR;
-	if (yych == '"') goto yy77;
-	goto yy18;
-yy59:
-	yych = *++YYCURSOR;
-	if (yych == '{') goto yy79;
-	goto yy18;
-yy60:
-	++YYCURSOR;
-#line 683 "ext/standard/var_unserializer.re"
-	{
-	*p = YYCURSOR;
-	ZVAL_BOOL(rval, parse_iv(start + 2));
-	return 1;
-}
-#line 994 "ext/standard/var_unserializer.c"
-yy62:
-	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	if (yych <= ';') {
-		if (yych <= '/') goto yy18;
-		if (yych <= '9') goto yy62;
-		if (yych <= ':') goto yy18;
-	} else {
-		if (yych <= 'E') {
-			if (yych <= 'D') goto yy18;
-			goto yy66;
-		} else {
-			if (yych == 'e') goto yy66;
-			goto yy18;
-		}
-	}
-yy64:
-	++YYCURSOR;
-#line 731 "ext/standard/var_unserializer.re"
-	{
-#if SIZEOF_ZEND_LONG == 4
-use_double:
-#endif
-	*p = YYCURSOR;
-	ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL));
-	return 1;
-}
-#line 1023 "ext/standard/var_unserializer.c"
-yy66:
-	yych = *++YYCURSOR;
-	if (yych <= ',') {
-		if (yych == '+') goto yy81;
-		goto yy18;
-	} else {
-		if (yych <= '-') goto yy81;
-		if (yych <= '/') goto yy18;
-		if (yych <= '9') goto yy82;
-		goto yy18;
-	}
-yy67:
-	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy84;
-	goto yy18;
-yy68:
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy84;
-	goto yy18;
-yy69:
-	++YYCURSOR;
-#line 689 "ext/standard/var_unserializer.re"
-	{
-#if SIZEOF_ZEND_LONG == 4
-	int digits = YYCURSOR - start - 3;
-
-	if (start[2] == '-' || start[2] == '+') {
-		digits--;
-	}
-
-	/* Use double for large zend_long values that were serialized on a 64-bit system */
-	if (digits >= MAX_LENGTH_OF_LONG - 1) {
-		if (digits == MAX_LENGTH_OF_LONG - 1) {
-			int cmp = strncmp((char*)YYCURSOR - MAX_LENGTH_OF_LONG, long_min_digits, MAX_LENGTH_OF_LONG - 1);
-
-			if (!(cmp < 0 || (cmp == 0 && start[2] == '-'))) {
-				goto use_double;
-			}
-		} else {
-			goto use_double;
-		}
-	}
-#endif
-	*p = YYCURSOR;
-	ZVAL_LONG(rval, parse_iv(start + 2));
-	return 1;
-}
-#line 1071 "ext/standard/var_unserializer.c"
-yy71:
-	yych = *++YYCURSOR;
-	if (yych == '"') goto yy85;
-	goto yy18;
-yy72:
-	++YYCURSOR;
-#line 652 "ext/standard/var_unserializer.re"
-	{
-	zend_long id;
-
- 	*p = YYCURSOR;
-	if (!var_hash) return 0;
-
-	id = parse_uiv(start + 2) - 1;
-	if (id == -1 || (rval_ref = var_access(var_hash, id)) == NULL) {
-		return 0;
-	}
-
-	if (rval_ref == rval) {
-		return 0;
-	}
-
-	if (Z_ISUNDEF_P(rval_ref) || (Z_ISREF_P(rval_ref) && Z_ISUNDEF_P(Z_REFVAL_P(rval_ref)))) {
-		ZVAL_UNDEF(rval);
-		return 1;
-	}
-
-	ZVAL_COPY(rval, rval_ref);
-
-	return 1;
-}
-#line 1103 "ext/standard/var_unserializer.c"
-yy74:
-	yych = *++YYCURSOR;
-	if (yych == '"') goto yy87;
-	goto yy18;
-yy75:
-	++YYCURSOR;
-#line 853 "ext/standard/var_unserializer.re"
-	{
-	size_t len, len2, len3, maxlen;
-	zend_long elements;
-	char *str;
-	zend_string *class_name;
-	zend_class_entry *ce;
-	int incomplete_class = 0;
-
-	int custom_object = 0;
-
-	zval user_func;
-	zval retval;
-	zval args[1];
-
-    if (!var_hash) return 0;
-	if (*start == 'C') {
-		custom_object = 1;
-	}
-
-	len2 = len = parse_uiv(start + 2);
-	maxlen = max - YYCURSOR;
-	if (maxlen < len || len == 0) {
-		*p = start + 2;
-		return 0;
-	}
-
-	str = (char*)YYCURSOR;
-
-	YYCURSOR += len;
-
-	if (*(YYCURSOR) != '"') {
-		*p = YYCURSOR;
-		return 0;
-	}
-	if (*(YYCURSOR+1) != ':') {
-		*p = YYCURSOR+1;
-		return 0;
-	}
-
-	len3 = strspn(str, "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377\\");
-	if (len3 != len)
-	{
-		*p = YYCURSOR + len3 - len;
-		return 0;
-	}
-
-	class_name = zend_string_init(str, len, 0);
-
-	do {
-		if(!unserialize_allowed_class(class_name, var_hash)) {
-			incomplete_class = 1;
-			ce = PHP_IC_ENTRY;
-			break;
-		}
-
-		/* Try to find class directly */
-		BG(serialize_lock)++;
-		ce = zend_lookup_class(class_name);
-		if (ce) {
-			BG(serialize_lock)--;
-			if (EG(exception)) {
-				zend_string_release(class_name);
-				return 0;
-			}
-			break;
-		}
-		BG(serialize_lock)--;
-
-		if (EG(exception)) {
-			zend_string_release(class_name);
-			return 0;
-		}
-
-		/* Check for unserialize callback */
-		if ((PG(unserialize_callback_func) == NULL) || (PG(unserialize_callback_func)[0] == '\0')) {
-			incomplete_class = 1;
-			ce = PHP_IC_ENTRY;
-			break;
-		}
-
-		/* Call unserialize callback */
-		ZVAL_STRING(&user_func, PG(unserialize_callback_func));
-
-		ZVAL_STR_COPY(&args[0], class_name);
-		BG(serialize_lock)++;
-		if (call_user_function_ex(CG(function_table), NULL, &user_func, &retval, 1, args, 0, NULL) != SUCCESS) {
-			BG(serialize_lock)--;
-			if (EG(exception)) {
-				zend_string_release(class_name);
-				zval_ptr_dtor(&user_func);
-				zval_ptr_dtor(&args[0]);
-				return 0;
-			}
-			php_error_docref(NULL, E_WARNING, "defined (%s) but not found", Z_STRVAL(user_func));
-			incomplete_class = 1;
-			ce = PHP_IC_ENTRY;
-			zval_ptr_dtor(&user_func);
-			zval_ptr_dtor(&args[0]);
-			break;
-		}
-		BG(serialize_lock)--;
-		zval_ptr_dtor(&retval);
-		if (EG(exception)) {
-			zend_string_release(class_name);
-			zval_ptr_dtor(&user_func);
-			zval_ptr_dtor(&args[0]);
-			return 0;
-		}
-
-		/* The callback function may have defined the class */
-		BG(serialize_lock)++;
-		if ((ce = zend_lookup_class(class_name)) == NULL) {
-			php_error_docref(NULL, E_WARNING, "Function %s() hasn't defined the class it was called for", Z_STRVAL(user_func));
-			incomplete_class = 1;
-			ce = PHP_IC_ENTRY;
-		}
-		BG(serialize_lock)--;
-
-		zval_ptr_dtor(&user_func);
-		zval_ptr_dtor(&args[0]);
-		break;
-	} while (1);
-
-	*p = YYCURSOR;
-
-	if (custom_object) {
-		int ret;
-
-		ret = object_custom(UNSERIALIZE_PASSTHRU, ce);
-
-		if (ret && incomplete_class) {
-			php_store_class_name(rval, ZSTR_VAL(class_name), len2);
-		}
-		zend_string_release(class_name);
-		return ret;
-	}
-
-	elements = object_common1(UNSERIALIZE_PASSTHRU, ce);
-
-	if (elements < 0) {
-	   zend_string_release(class_name);
-	   return 0;
-	}
-
-	if (incomplete_class) {
-		php_store_class_name(rval, ZSTR_VAL(class_name), len2);
-	}
-	zend_string_release(class_name);
-
-	return object_common2(UNSERIALIZE_PASSTHRU, elements);
-}
-#line 1262 "ext/standard/var_unserializer.c"
-yy77:
-	++YYCURSOR;
-#line 778 "ext/standard/var_unserializer.re"
-	{
-	size_t len, maxlen;
-	zend_string *str;
-
-	len = parse_uiv(start + 2);
-	maxlen = max - YYCURSOR;
-	if (maxlen < len) {
-		*p = start + 2;
-		return 0;
-	}
-
-	if ((str = unserialize_str(&YYCURSOR, len, maxlen)) == NULL) {
-		return 0;
-	}
-
-	if (*(YYCURSOR) != '"') {
-		zend_string_free(str);
-		*p = YYCURSOR;
-		return 0;
-	}
-
-	if (*(YYCURSOR + 1) != ';') {
-		efree(str);
-		*p = YYCURSOR + 1;
-		return 0;
-	}
-
-	YYCURSOR += 2;
-	*p = YYCURSOR;
-
-	ZVAL_STR(rval, str);
-	return 1;
-}
-#line 1299 "ext/standard/var_unserializer.c"
-yy79:
-	++YYCURSOR;
-#line 812 "ext/standard/var_unserializer.re"
-	{
-	zend_long elements = parse_iv(start + 2);
-	/* use iv() not uiv() in order to check data range */
-	*p = YYCURSOR;
-    if (!var_hash) return 0;
-
-	if (elements < 0 || elements >= HT_MAX_SIZE) {
-		return 0;
-	}
-
-	array_init_size(rval, elements);
-	if (elements) {
-		/* we can't convert from packed to hash during unserialization, because
-		   reference to some zvals might be keept in var_hash (to support references) */
-		zend_hash_real_init(Z_ARRVAL_P(rval), 0);
-	}
-
-	/* The array may contain references to itself, in which case we'll be modifying an
-	 * rc>1 array. This is okay, since the array is, ostensibly, only visible to
-	 * unserialize (in practice unserialization handlers also see it). Ideally we should
-	 * prohibit "r:" references to non-objects, as we only generate them for objects. */
-	HT_ALLOW_COW_VIOLATION(Z_ARRVAL_P(rval));
-
-	if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_P(rval), elements, 0)) {
-		return 0;
-	}
-
-	return finish_nested_data(UNSERIALIZE_PASSTHRU);
-}
-#line 1332 "ext/standard/var_unserializer.c"
-yy81:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych >= ':') goto yy18;
-yy82:
-	++YYCURSOR;
-	if (YYLIMIT <= YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy82;
-	if (yych == ';') goto yy64;
-	goto yy18;
-yy84:
-	yych = *++YYCURSOR;
-	if (yych == ';') goto yy89;
-	goto yy18;
-yy85:
-	++YYCURSOR;
-#line 842 "ext/standard/var_unserializer.re"
-	{
-	zend_long elements;
-    if (!var_hash) return 0;
-
-	elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR);
-	if (elements < 0 || elements >= HT_MAX_SIZE) {
-		return 0;
-	}
-	return object_common2(UNSERIALIZE_PASSTHRU, elements);
-}
-#line 1362 "ext/standard/var_unserializer.c"
-yy87:
-	++YYCURSOR;
-#line 740 "ext/standard/var_unserializer.re"
-	{
-	size_t len, maxlen;
-	char *str;
-
-	len = parse_uiv(start + 2);
-	maxlen = max - YYCURSOR;
-	if (maxlen < len) {
-		*p = start + 2;
-		return 0;
-	}
-
-	str = (char*)YYCURSOR;
-
-	YYCURSOR += len;
-
-	if (*(YYCURSOR) != '"') {
-		*p = YYCURSOR;
-		return 0;
-	}
-
-	if (*(YYCURSOR + 1) != ';') {
-		*p = YYCURSOR + 1;
-		return 0;
-	}
-
-	YYCURSOR += 2;
-	*p = YYCURSOR;
-
-	if (len == 0) {
-		ZVAL_EMPTY_STRING(rval);
-	} else if (len == 1) {
-		ZVAL_INTERNED_STR(rval, ZSTR_CHAR((zend_uchar)*str));
-	} else {
-		ZVAL_STRINGL(rval, str, len);
-	}
-	return 1;
-}
-#line 1403 "ext/standard/var_unserializer.c"
-yy89:
-	++YYCURSOR;
-#line 715 "ext/standard/var_unserializer.re"
-	{
-	*p = YYCURSOR;
-
-	if (!strncmp((char*)start + 2, "NAN", 3)) {
-		ZVAL_DOUBLE(rval, ZEND_NAN);
-	} else if (!strncmp((char*)start + 2, "INF", 3)) {
-		ZVAL_DOUBLE(rval, ZEND_INFINITY);
-	} else if (!strncmp((char*)start + 2, "-INF", 4)) {
-		ZVAL_DOUBLE(rval, -ZEND_INFINITY);
-	} else {
-		ZVAL_NULL(rval);
-	}
-
-	return 1;
-}
-#line 1422 "ext/standard/var_unserializer.c"
-}
-#line 1013 "ext/standard/var_unserializer.re"
-
-
-	return 0;
-}
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index ac30382959058..185e62d0f588a 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -474,13 +474,12 @@ string_key:
 
 static inline int finish_nested_data(UNSERIALIZE_PARAMETER)
 {
-	if (*((*p)++) == '}')
-		return 1;
+	if (*p >= max || **p != '}') {
+		return 0;
+	}
 
-#if SOMETHING_NEW_MIGHT_LEAD_TO_CRASH_ENABLE_IF_YOU_ARE_BRAVE
-	zval_ptr_dtor(rval);
-#endif
-	return 0;
+	(*p)++;
+	return 1;
 }
 
 static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
diff --git a/ext/wddx/tests/bug74145.phpt b/ext/wddx/tests/bug74145.phpt
new file mode 100644
index 0000000000000..a99a1178cade6
--- /dev/null
+++ b/ext/wddx/tests/bug74145.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #74145 (wddx parsing empty boolean tag leads to SIGSEGV)
+--SKIPIF--
+<?php
+if (!extension_loaded("wddx")) print "skip";
+?>
+--FILE--
+<?php
+$data = file_get_contents(__DIR__ . '/bug74145.xml');
+$wddx = wddx_deserialize($data);
+var_dump($wddx);
+?>
+DONE
+--EXPECTF--
+NULL
+DONE
\ No newline at end of file
diff --git a/ext/wddx/tests/bug74145.xml b/ext/wddx/tests/bug74145.xml
new file mode 100644
index 0000000000000..e5d35fb0a4905
--- /dev/null
+++ b/ext/wddx/tests/bug74145.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' ?>
+    <!DOCTYPE et SYSTEM 'w'>
+    <wddxPacket ven='1.0'>
+        <array>
+            <var Name="name">
+                <boolean ></boolean>
+            </var>
+        </array>
+    </wddxPacket>
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 6e105e8ab3d98..a540b241764e2 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -761,19 +761,16 @@ static void php_wddx_push_element(void *user_data, const XML_Char *name, const X
 	} else if (!strcmp((char *)name, EL_BOOLEAN)) {
 		int i;
 
+		ent.type = ST_BOOLEAN;
+		SET_STACK_VARNAME;
 		if (atts) for (i = 0; atts[i]; i++) {
 			if (!strcmp((char *)atts[i], EL_VALUE) && atts[i+1] && atts[i+1][0]) {
-				ent.type = ST_BOOLEAN;
-				SET_STACK_VARNAME;
-
 				ZVAL_TRUE(&ent.data);
 				wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry));
 				php_wddx_process_data(user_data, atts[i+1], strlen((char *)atts[i+1]));
 				break;
 			}
 		} else {
-			ent.type = ST_BOOLEAN;
-			SET_STACK_VARNAME;
 			ZVAL_FALSE(&ent.data);
 			wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry));
 		}