Merge: github: Summer cleaning