Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'