phpDoc fixes. Reverse merge to fix unwanted commit.