Merge remote-tracking branch 'origin/1.3.1-wip' into 1.3.1-wip
Upgrade peridot(1.4.0)
Merge remote-tracking branch 'origin/1.3.1-wip' into 1.3.1-config

Conflicts:
	composer.json
add namespace section seoc