Change-Id: Icaba711464f672a3bfbb9d83a449d47e72ba11ff Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>