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