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