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