Fixed docblocks
Merge branch '4.1'