Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.dockerignore
#	app/core/midjourney.ts