Merge pull request #6487 from MrPetovan/bug/critical-fixes-after-develop-rebase
authorMichael Vogel <icarus@dabo.de>
Tue, 22 Jan 2019 14:45:33 +0000 (15:45 +0100)
committerGitHub <noreply@github.com>
Tue, 22 Jan 2019 14:45:33 +0000 (15:45 +0100)
Critical fixes after develop rebase


Trivial merge