Merge changes from SVFlatSegmentedControl fork