Merge "Improve various PHP method doc blocks"