Merge branch 'master' into 'master'

Replace fastcgi_pass unix:/var/run/php5-fpm.sock; with fastcgi_pass unix:{fpm_so…

…cket}; in phpmyadmin and squirrelmail blocks, as they are considered apps and should use the same (apps.sock) listener.

See merge request !236