Fixed docblock
Merge branch '4.2'