Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'