Fix: PHPCS
Update doc
Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
	.travis.yml