Tweak an edge case in line number handling.
Version bump after internal testing
Merge branch 'master' into guid-work