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