Bug 992274 - Tweak an edge case in line number handling. r=jorendorff, a=1.2.x+
Merge b2g26 to v1.2f. a=merge