Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-22 17d53616b36fef3b753fc408bfc600f360673333

 server/lib/classes/monitor_tools.inc.php

@@ -62,6 +62,10 @@
            $mainver = array_filter($mainver);
            $mainver = current($mainver).'.'.next($mainver);
            switch ($mainver){
            case "16.04":
               $relname = "(Xenial Xerus)";
               $distid = 'ubuntu1604';
               break;
            case "15.10":
               $relname = "(Wily Werewolf)";
               break;