Strip number changed to unsigned int
Pick up unsigned int in StripSet
Merge branch 'master' into production