Merge pull request #6483 from MrPetovan/bug/fixes-after-2019-03-develop-rebase
authorMichael Vogel <icarus@dabo.de>
Mon, 21 Jan 2019 20:52:22 +0000 (21:52 +0100)
committerGitHub <noreply@github.com>
Mon, 21 Jan 2019 20:52:22 +0000 (21:52 +0100)
Fixes after 2019 03 develop rebase


Trivial merge