chadhietala Merge pull request #16888 from emberjs/update-router …