Patch from Havard Eidnes <Havard.Eidnes@runit.sintef.no>: