Shortened SSH file loading
Merge branch 'master' into github

* master:
  Shortened SSH file loading