Add non-GitHub path to CONTRIBUTING.md
Merge branch 'next'