Merge "setools: fix sesearch, add sediff"