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