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