Edited comment
Fix comment.
Merge branch '4.2'