Cleanup
Cleanup
Merge branch 'master' into mta

Conflicts:
	tools/build-routeconfig.sh