maintenance
Merge remote-tracking branch 'upstream/master'
added php doc blocks to various api classes