am aea68fdd: Merge "Don\'t fail when trying to add routes that already exist."

* commit 'aea68fddd979bf6852b8aef9bc718567f9da935a':
  Don't fail when trying to add routes that already exist.
tree: 59cf5c8fc096fe8e35835d125215c7268d3d1cfc
  1. client/
  2. include/
  3. server/