--- openssh-6.6p1/ssh_config.orig	2013-10-10 01:24:12.000000000 +0200
+++ openssh-6.6p1/ssh_config	2014-04-09 16:26:50.292117342 +0200
@@ -17,9 +17,9 @@
 # list of available options, their meanings and defaults, please see the
 # ssh_config(5) man page.
 
-# Host *
+Host *
 #   ForwardAgent no
-#   ForwardX11 no
+    ForwardX11 no
 #   RhostsRSAAuthentication no
 #   RSAAuthentication yes
 #   PasswordAuthentication yes
@@ -46,3 +46,5 @@
 #   VisualHostKey no
 #   ProxyCommand ssh -q -W %h:%p gateway.example.com
 #   RekeyLimit 1G 1h
+    SendEnv LANG LC_*
+    ServerAliveInterval 60