Change-Id: I9dcd35e257dbbef2b38e0cc08f456f61d9a5a512 Reviewed-by: Daniel Teske <daniel.teske@digia.com>