treat non-http urls the same as other not_found urls instead of dying
Merge branch 'master' into RELEASE_20140325