Merge "Add the alignment offset to the glyph lines." into devel/master