Update ndyck/trunk to yade/trunk