Merge branch 'master' of linz:/srv/git/git-kairo

diff --combined include/classes/useragent.php-class
index d09585d71efd732f203516b6411615a4f2e2ed1f,26c801652dd548ae810a7d581d053283529c258c..e5e91c5720baf8e62a1c33473f261af60208292e
--- 1/include/classes/useragent.php-class
--- 2/include/classes/useragent.php-class
+++ b/include/classes/useragent.php-class
@@@ -349,7 -349,7 +349,7 @@@ class userAgent 
        $this->version = $regs[1];
        $this->bot = false;
      }
-     elseif (preg_match('|Konqueror/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+     elseif (preg_match('|Konqueror/([0-9a-zA-Z\.+]+)|i', $this->uastring, $regs)) {
        $this->brand = 'Konqueror';
        $this->version = $regs[1];
        $this->bot = false;
@@@ -1491,9 -1491,6 +1491,9 @@@
          elseif ($this->uadata['os'] == 'Windows NT 6.3') { $this->uadata['os'] = 'Windows 8.1'; }
          elseif ($this->uadata['os'] == 'Windows NT 6.3 (Win64)') { $this->uadata['os'] = 'Windows 8.1 (64bit)'; }
          elseif ($this->uadata['os'] == 'Windows NT 6.3 (WOW64)') { $this->uadata['os'] = 'Windows 8.1 (64bit)'; }
 +        elseif ($this->uadata['os'] == 'Windows NT 6.4') { $this->uadata['os'] = 'Windows 10'; }
 +        elseif ($this->uadata['os'] == 'Windows NT 6.4 (Win64)') { $this->uadata['os'] = 'Windows 10 (64bit)'; }
 +        elseif ($this->uadata['os'] == 'Windows NT 6.4 (WOW64)') { $this->uadata['os'] = 'Windows 10 (64bit)'; }
          elseif ($this->uadata['os'] == 'Win95') { $this->uadata['os'] = 'Windows 95'; }
          elseif ($this->uadata['os'] == 'Win98') { $this->uadata['os'] = 'Windows 98'; }
          elseif ($this->uadata['os'] == 'WinNT') { $this->uadata['os'] = 'Windows NT'; }

diff --combined testbed/ua_list_raw.txt
index ad7479ef05d37199298337a8afd277f569b54cf8,2204db1e266982e54506809728b38eaab540b7c6..37bc929efde1851d60835f69a8449e34ca7c8377
--- 1/testbed/ua_list_raw.txt
--- 2/testbed/ua_list_raw.txt
+++ b/testbed/ua_list_raw.txt
@@@ -45,7 -45,6 +45,7 @@@ Mozilla/5.0 (Windows NT 6.2; rv:10.0.1
  Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0a1) Gecko/20120117 Firefox/12.0a1
  Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:12.0a1) Gecko/20100101 Firefox/12.0a1
  Mozilla/5.0 (Windows NT 6.2; WOW64; rv:13.0) Gecko/13.0 Firefox/13.0
 +Mozilla/5.0 (Windows NT 6.4; WOW64; rv:37.0) Gecko/20100101 Firefox/37.0
  Mozilla/5.0 (Macintosh; Intel Mac OS X 10.5; rv:2.0.1) Gecko/20100101 Firefox/4.0.1
  Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:2.0.1) Gecko/20100101 Firefox/4.0.1
  Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:2.0b6pre) Gecko/20100907 Firefox/4.0b6pre
@@@ -141,7 -140,6 +141,7 @@@ Mozilla/5.0 (compatible; MSIE 10.0; Win
  Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Trident/6.0; Touch)
  Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; rv:11.0) like Gecko
  Mozilla/5.0 (IE 11.0; Windows NT 6.3; Trident/7.0; .NET4.0E; .NET4.0C; rv:11.0) like Gecko
 +Mozilla/5.0 (Windows NT 6.4; WOW64; Trident/7.0; rv:11.0) like Gecko
  Mozilla/4.0 (compatible; MSIE 4.01; Windows CE; Smartphone; 176x220)
  Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Hotbar 4.5.1.0; MSN 6.1; MSNbMSFT; MSNmen-au; MSNc00; v5m)
  Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322; MSN 9.0;MSN 9.1; MSNbVZ02; MSNmen-us; MSNcOTH; MPLUS)
@@@ -178,6 -176,7 +178,7 @@@ Mozilla/5.0 (compatible; Konqueror/3.1
  Mozilla/5.0 (compatible; Konqueror/3.2; OpenBSD) (KHTML, like Gecko)
  Mozilla/5.0 (compatible; Konqueror/3.4; Linux) KHTML/3.4.0 (like Gecko)
  Mozilla/5.0 (compatible; Konqueror/3.3; Linux; X11; i686; es, en_US) KHTML/3.3.2 (like Gecko)
+ Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.34 (KHTML, like Gecko) konqueror/4.14.0 Safari/534.34
  Mozilla/5.0 (Windows; U; Windows NT 5.1; de) AppleWebKit/522.13.1 (KHTML, like Gecko) Version/3.0.2 Safari/522.13.1
  Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/51 (like Gecko) Safari/51
  Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27