Merge pull request #1432 from buildersbrewery/master

LSL updates