Merge pull request #821 from andrewshadura/luci-route-types