Updating stable

Automerge wont work because of the "emergency edit" in `php-fpm::monit`