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