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