CS fix
Merge remote-tracking branch 'origin/0.3'

Conflicts:
	src/routes.php