fix Contributors
Merge master into prod