Merge branch 'develop' into patch-1

diff --cc include/dba.php
index 4252558346a384020eaa07b2e6afacc76c650985,208cf5812140be6d4953f929a935140b34795fdb..b24d9b409d00125ad7349848d822089a5e908aff
--- 1/include/dba.php
--- 2/include/dba.php
+++ b/include/dba.php
@@@ -52,9 -52,8 +52,9 @@@ class dba 
                }
  
                if ($install) {
 -                      if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
 +                      // server has to be a non-empty string that is not 'localhost' and not an IP
 +                      if (strlen($server) && ($server !== 'localhost') && filter_var($server, FILTER_VALIDATE_IP) === false) {
-                               if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
+                               if (! dns_get_record($server, DNS_A + DNS_CNAME)) {
                                        self::$error = L10n::t('Cannot locate DNS info for database server \'%s\'', $server);
                                        return false;
                                }