Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -33,6 +33,7 @@ phpMyAdmin - ChangeLog
 - issue #12200 Fixed check for ndb version
 - issue #12206 Fixed loading of configuration file
 - issue #12204 Check if sessions are working and report failures
+- issue #12211 non-clickable initial letter for users / and can't modify users with MySQL 5.7.12
 
 4.6.0.0 (2016-03-22)
 + issue #11456 Disabled storage engines

libraries/server_privileges.lib.php

@@ -3844,7 +3844,8 @@ function PMA_getHtmlForInitials($array_initials)
     }
 
     $initials = $GLOBALS['dbi']->tryQuery(
-        'SELECT DISTINCT UPPER(LEFT(`User`,1)) FROM `user` ORDER BY `User` ASC',
+        'SELECT DISTINCT UPPER(LEFT(`User`,1)) FROM `user`'
+        . ' ORDER BY UPPER(LEFT(`User`,1)) ASC',
         null,
         PMA\libraries\DatabaseInterface::QUERY_STORE
     );