Merge branch 'develop'
Update contributing.md
Merge remote-tracking branch 'Upstream/master' into develop