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