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