contributing users
Merge branch 'master' into contributingUsers