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