Merge remote-tracking branch 'upstream/develop' into app-user2

diff --cc mod/item.php
Simple merge

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

diff --cc src/Module/Contact.php
Simple merge

diff --cc src/Module/NoScrape.php
Simple merge

diff --cc src/Module/Profile/Profile.php
Simple merge

diff --cc src/Module/Settings/Profile/Index.php
index dbcb7fb06afc944a47ad665bf684ce9d97dafb5b,4f4ddbdb3e049fcb39ac033707e61a9eadf1ed15..042ff66c2bb2dc7fc7066d274444472e92575d03
--- 1/src/Module/Settings/Profile/Index.php
--- 2/src/Module/Settings/Profile/Index.php
+++ b/src/Module/Settings/Profile/Index.php
@@@ -238,8 -243,9 +240,9 @@@ class Index extends BaseSetting
                        '$region' => ['region', DI::l10n()->t('Region/State:'), $profile['region']],
                        '$postal_code' => ['postal_code', DI::l10n()->t('Postal/Zip Code:'), $profile['postal-code']],
                        '$country_name' => ['country_name', DI::l10n()->t('Country:'), $profile['country-name']],
 -                      '$age' => ((intval($profile['dob'])) ? '(' . DI::l10n()->t('Age: ') . DI::l10n()->tt('%d year old', '%d years old', Temporal::getAgeByTimezone($profile['dob'], $a->user['timezone'])) . ')' : ''),
 -                      '$xmpp' => ['xmpp', DI::l10n()->t('XMPP (Jabber) address:'), $profile['xmpp'], DI::l10n()->t('The XMPP address will be published so that people can follow you there.')],
 +                      '$age' => ((intval($profile['dob'])) ? '(' . DI::l10n()->t('Age: ') . DI::l10n()->tt('%d year old', '%d years old', Temporal::getAgeByTimezone($profile['dob'], $profile['timezone'])) . ')' : ''),
 +                      '$xmpp' => ['xmpp', DI::l10n()->t('XMPP (Jabber) address:'), $profile['xmpp'], DI::l10n()->t('The XMPP address will be propagated to your contacts so that they can follow you.')],
+                       '$matrix' => ['matrix', DI::l10n()->t('Matrix (Element) address:'), $profile['matrix'], DI::l10n()->t('The Matrix address will be published so that people can follow you there.')],
                        '$homepage' => ['homepage', DI::l10n()->t('Homepage URL:'), $profile['homepage']],
                        '$pub_keywords' => ['pub_keywords', DI::l10n()->t('Public Keywords:'), $profile['pub_keywords'], DI::l10n()->t('(Used for suggesting potential friends, can be seen by others)')],
                        '$prv_keywords' => ['prv_keywords', DI::l10n()->t('Private Keywords:'), $profile['prv_keywords'], DI::l10n()->t('(Used for searching profiles, never shown to others)')],