Merge remote-tracking branch 'upstream/develop' into dfrn-2

diff --cc mod/dfrn_notify.php
index 0743b214358df3dc560e69cd8d8b10cde5dcb001,073226b82998598e5f95f611c48646f53e51c0a7..a9dbcd2633d0fc01dd13ed7564d9e60bf1fc60d9
--- 1/mod/dfrn_notify.php
--- 2/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@@ -12,10 -12,8 +12,9 @@@ use Friendica\Core\System
  use Friendica\Database\DBM;
  use Friendica\Model\Contact;
  use Friendica\Protocol\DFRN;
 +use Friendica\Protocol\Diaspora;
  
  require_once 'include/items.php';
- require_once 'include/event.php';
  
  function dfrn_notify_post(App $a) {
        logger(__function__, LOGGER_TRACE);