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