Conflicts: pandora_console/install.php Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2