Change-Id: I71a1063a1de3e4bb445bf9f8faa5553da3b5c4ab
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 54da4378

)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>