Merge pull request #1545 from mfournier/contributing