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