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