Bugfix; routes were removed by accident, put them back.
Merge commit '1e82f2328d03202b49740a2d685d724699449998' into v1.0.x