Merge pull request #4055 from akallabeth/talos_v3 2.0.0-rc0
authorNorbert Federa <nfedera@users.noreply.github.com>
Mon, 24 Jul 2017 08:46:54 +0000 (10:46 +0200)
committerGitHub <noreply@github.com>
Mon, 24 Jul 2017 08:46:54 +0000 (10:46 +0200)
Security fixes and code cleanups


Trivial merge