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