Commit 55d911d69a1e4d5f9845cadf13dc73acde926be9

Edward Thomson 2017-02-26T16:08:00

Merge pull request #4142 from pblesi/patch-1 Fix minor typos in CONVENTIONS.md