Merge branch 'ls/github' into maint