Improve PHPdocs.
Merge branch '7.x-1.x' into update-resource