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