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