Wildcard routing for image proxy
Merge branch 'master' into no-no-reload