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