Merge "Change usages of xrange() to range()"