Change-Id: Ieb559e884fb08c96d739cf7684389ff740a6233e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>