Use constants everywhere as much as possible.
[auto] Merge from Router

    • #9496f4a — Use constants everywhere as much as possible. (Alexis von Glasow, 2013-11-06)

---

Merge remote branch 'library-router/master'