Standardize quoting.
Merge pull request #1819 from rolandwalker/quoting

Standardize quoting.