Conflicts: pandora_console/include/class/ConsoleSupervisor.php Former-commit-id: 7bdd1bfbcbc43410fb05465418979f4d085fa230