Bug 945939 - Use the pre-split value when numbering values. r=sunfish, a=abillings
Merge b2g18 to v1.1hd. a=merge