= routing: fix broken test
Merge branch 'master' into release/1.1