Merge branch 'features/tex_antialiased_lines' (#3245)