Generator: Handle route inclusions
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  update client-side router generation