Fix incorrect comment
Merge branch '4.1'