Master

Merged Simon Michnowicz requested to merge (removed):master into master

fixed up setupKnownHosts

Merge request reports