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