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