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