Merge branch 'master' into bugfix/prefer-display_name-over-name1-name2-7843

application/forms/LdapDiscoveryForm.php

@@ -48,7 +48,7 @@ class LdapDiscoveryForm extends Form
                 array(
                     'required'      => false,
                     'label'         => $this->translate('Host'),
-                    'description'   => $this->translate('IP or host name to search.'),
+                    'description'   => $this->translate('IP or hostname to search.'),
                 )
             );
 

modules/monitoring/library/Monitoring/DataView/DataView.php

@@ -83,6 +83,7 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
 
     public function dump()
     {
+        $this->order();
         return $this->query->dump();
     }
 

modules/monitoring/library/Monitoring/DataView/ServiceStatus.php

@@ -138,9 +138,6 @@ class ServiceStatus extends DataView
                 ),
                 'order' => self::SORT_ASC
             ),
-            'host_last_state_change' => array(
-                'order' => self::SORT_ASC
-            ),
             'host_severity' => array(
                 'columns' => array(
                     'host_severity',