Open Source Friday collective commit

Collective commits from OSF