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