Make methods on the router overridable. Denote private methods with _
Merge pull request #3073 from alexspeller/make-setupRouter-public

Make methods on the router overridable