Merge "replace basetring/xrange"