Add note in CONVENTIONS about inlined functions
Remove whitespace
Merge pull request #1188 from tnm/inline-convention

Inline convention