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