Commits to local stuff before switching to a different branch
Merge branch 'trunk' of github.com:/larlight/LArLight into trunk