Update CONTRIBUTING.md
Update CONTRIBUTING.md
Merge remote-tracking branch 'upstream/dev' into dev

* upstream/dev:
  Update CONTRIBUTING.md