Merge remote-tracking branch 'origin/master'

Conflicts:
	1.php
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 5d97eb8f791b70829104a0bf00fd1410e1be8890.
Merge remote-tracking branch 'origin/master'