Merge pull request #293 from roundcube/changes-from-update.sh

diff --cc apache/Dockerfile
Simple merge

diff --cc fpm-alpine/Dockerfile
Simple merge

diff --cc fpm/Dockerfile
Simple merge