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