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