Cleaning up comment.
Merge branch '4.0'