better x11 forwarding
Merge remote-tracking branch 'origin/master'