Merge remote-tracking branch 'upstream/master' into managesieve-proxy

core/nginx/start.py

@@ -2,6 +2,9 @@
 
 import os
 import subprocess
+from socrate import system
+
+system.set_env(log_filters=r'could not be resolved \(\d\: [^\)]+\) while in resolving client address, client\: [^,]+, server: [^\:]+\:(25,110,143,587,465,993,995)$')
 
 # Check if a stale pid file exists
 if os.path.exists("/var/run/nginx.pid"):