Merge branch 'fix-mastodon-notifications-without-nickname' into 'develop'