Merge branch 'master' 2019.12 into develop

diff --cc include/api.php
Simple merge

diff --cc src/App.php
Simple merge

diff --cc src/Module/TwoFactor/Verify.php
Simple merge

diff --cc tests/include/ApiTest.php
index ef46a4d447c729c4aa17f4664c6d2fab9f63e227,3d6bdc0c16816c8adb8fd862441e3bb36678e385..c54135faeeac228e741d3944f8dbe5b076e6c7a8
--- 1/tests/include/ApiTest.php
--- 2/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@@ -11,10 -11,9 +11,11 @@@ use Friendica\BaseObject
  use Friendica\Core\Config\Configuration;
  use Friendica\Core\Config\PConfiguration;
  use Friendica\Core\Protocol;
 +use Friendica\Core\Session;
 +use Friendica\Core\Session\ISession;
  use Friendica\Core\System;
  use Friendica\Database\Database;
+ use Friendica\Model\Contact;
  use Friendica\Network\HTTPException;
  use Friendica\Test\Util\Database\StaticDatabase;
  use Monolog\Handler\TestHandler;