Fix 2585 and clean up warning in contributing.rst
Fix 2585, rebase to master
Merge pull request #2590 from metalivedev/2585-addphplib

Fix 2585 and clean up warning in contributing.rst