Merge remote-tracking branch 'friendica/stable' into develop

# Conflicts:
#	composer.lock

diff --cc bin/worker.php
index 46eff1071a10fc3a050cc887ea8f8f7e272ab0c2,833e5b00207ef06b84026611f8ce602dfba0de9c..5698cf16ddfaca79eb69b0e1aa04d3efa515435c
--- 1/bin/worker.php
--- 2/bin/worker.php
+++ b/bin/worker.php
@@@ -21,9 -21,13 +21,14 @@@
   * Starts the background processing
   */
  
+ if (php_sapi_name() !== 'cli') {
+       header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
+       exit();
+ }
+ 
  use Dice\Dice;
  use Friendica\App;
 +use Friendica\Core\Process;
  use Friendica\Core\Update;
  use Friendica\Core\Worker;
  use Friendica\DI;

diff --cc composer.json
Simple merge

diff --cc composer.lock
index ebd434e39ee92d593ba5087062ff6979c2d0574a,fae71d6dcf0ceef48a43d77002a42d88f7fee690..d2b5f74a214aa4c0115505b8626d043285cd460f
--- 1/composer.lock
--- 2/composer.lock
+++ b/composer.lock
@@@ -4,7 -4,7 +4,7 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
          "This file is @generated automatically"
      ],
-     "content-hash": "ffe94190e166cebf80601fc3d6d26be0",
 -    "content-hash": "27203cc7da01ff668ba15e03fd17dc94",
++    "content-hash": "ed9aa898eaf8a1f8a807f3be9eecc3d7",
      "packages": [
          {
              "name": "asika/simple-console",

diff --cc src/Core/Worker.php
Simple merge

diff --cc src/Model/Item.php
Simple merge