[4.2] Docblock fixes
Merge branch '4.2'