Merge branch 'fix/pleroma.nginx' into 'develop'