docblock updates
Merge branch '2.4' into 3.0