Tweaked a comment
Merge branch '4.0'