Merge pull request #667 from srawlins/pedantic-1-11

Comply with lint in pedantic 1.11.0