Advanced Route
Merge branch 'staging' of github.com:ventoviro/windwalker into staging

Conflicts:
	composer.json
TrieMatcher