CONTRIBUTING.md: merged with master (looks like it haven't been for some reason)