RESTful delivery routes
Merge branch 'master' into openshift