Fixed failing test on jenkins master. No need to backport this to develop.
Merge pull request #890 from timlinux/master

[HOTFIX] Fixed failing test on jenkins master. No need to backport this to develo...