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