Tweak static file serving.
Tweak static file serving.
Merge branch 'master' into apikeys