Update rebase-master
Add ProxyCommand

Warning: This commit _will_ be rebased frequently.