phpDoc fixes Reverse merge to remove bad commit.