no longer needed
Merge branch 'master' into line-symbol