Merge remote-tracking branch 'origin/master' into chore(env)-php-fpm-pool-configuration

# Conflicts:
#	docker-compose.yml

Author: tarlepp