Merge pull request #4938 from akallabeth/warning_fixes_master
authorNorbert Federa <nfedera@users.noreply.github.com>
Thu, 18 Oct 2018 12:08:01 +0000 (14:08 +0200)
committerGitHub <noreply@github.com>
Thu, 18 Oct 2018 12:08:01 +0000 (14:08 +0200)
Warning fixes and TSG abort condition fix


Trivial merge