Merge branch 'notification-pleroma-settings' into 'develop'