Fix typo in comment

Closes gh-1596
Merge branch '1.1.x'