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