GL line feature

Sending this PR against master because of how I rebased my local gl-line-feature branch against an updated master branch.