Merge remote-tracking branch 'origin/master' into 2.1

diff --cc app/config/config.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Command/InstallCommand.php
index bd7b55f924ed2e60db89b0a4e002125cfa655a2f,035eb865575a038bd8c338c5635178c79bc702ac..3873d2d366762b88241874bb27415696b0b1cca3
--- 1/src/Wallabag/CoreBundle/Command/InstallCommand.php
--- 2/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@@ -69,10 -70,12 +69,12 @@@ class InstallCommand extends ContainerA
  
      protected function checkRequirements()
      {
 -        $this->defaultOutput->writeln('<info><comment>Step 1 of 5.</comment> Checking system requirements.</info>');
 +        $this->defaultOutput->writeln('<info><comment>Step 1 of 4.</comment> Checking system requirements.</info>');
  
-         $fulfilled = true;
+         $rows = [];
  
+         // testing if database driver exists
+         $fulfilled = true;
          $label = '<comment>PDO Driver</comment>';
          $status = '<info>OK!</info>';
          $help = '';

diff --cc src/Wallabag/CoreBundle/Helper/EntriesExport.php
Simple merge

diff --cc tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
Simple merge