Stop using $this->getRouteCollection() in router's generate method
Merge branch 'master' into HEAD