// upgrade max compatible version
Merge branch 'master_upstream'

Conflicts:
	PSWebServiceLibrary.php